diff options
| author | June McEnroe <june@causal.agency> | 2021-01-10 13:49:57 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2021-01-11 18:52:46 -0500 |
| commit | 6e311fab52a3544776f35068a9f07f66a8780812 (patch) | |
| tree | cc1889cb1eb003528236fff0d3da562a42e0afdc | |
| parent | Send CAP END if CAP LS response is empty (diff) | |
| download | pounce-6e311fab52a3544776f35068a9f07f66a8780812.tar.gz pounce-6e311fab52a3544776f35068a9f07f66a8780812.zip | |
Allow interspersing flags and config files
Don't wait for getopt_long to move all the arguments to the end. This allows overriding options set by config files by placing flags after them on the command line.
Diffstat (limited to '')
| -rw-r--r-- | config.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/config.c b/config.c index 958ee45..1835ef1 100644 --- a/config.c +++ b/config.c @@ -54,21 +54,17 @@ int getopt_config( const char *optstring, const struct option *longopts, int *longindex ) { static int opt; - if (opt >= 0) { - opt = getopt_long(argc, argv, optstring, longopts, longindex); - } - if (opt >= 0) return opt; - for (;;) { if (!file) { - if (optind < argc) { - num = 0; - path = argv[optind++]; - file = configOpen(path, "r"); - if (!file) return clean('?'); - } else { - return clean(-1); + if (optind == argc) return clean(-1); + if (opt >= 0 && argv[optind][0] == '-') { + opt = getopt_long(argc, argv, optstring, longopts, longindex); + if (opt >= 0 || optind == argc) return clean(opt); } + num = 0; + path = argv[optind++]; + file = configOpen(path, "r"); + if (!file) return clean('?'); } for (;;) { |