From 5d963809faa7b3c5c91dad5a29df8d8e6b1f5d09 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Sun, 10 Jan 2021 13:49:57 -0500 Subject: 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. --- config.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/config.c b/config.c index b8b4efa..861bf88 100644 --- a/config.c +++ b/config.c @@ -56,21 +56,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 (;;) { -- cgit 1.4.1