From d73e7f6eddb5a78d24a56852bc817c2a8f82fe89 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 4 Aug 2004 21:20:34 +0000 Subject: [PATCH] In set_refuse_options(): make sure we scan the whole list of options and avoid complaining about a wild-card spec that actually matches one or more options. --- options.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/options.c b/options.c index b0cf7234..563f0437 100644 --- a/options.c +++ b/options.c @@ -440,7 +440,7 @@ static void set_refuse_options(char *bp) { struct poptOption *op; char *cp, shortname[2]; - int is_wild; + int is_wild, found_match; shortname[1] = '\0'; @@ -454,20 +454,23 @@ static void set_refuse_options(char *bp) if (strcmp(bp, "delete") == 0) bp = "delete*"; is_wild = strpbrk(bp, "*?[") != NULL; + found_match = 0; for (op = long_options; ; op++) { - if (!op->longName) { - rprintf(FLOG, - "No match for refuse-options string \"%s\"\n", - bp); - break; - } *shortname = op->shortName; - if (wildmatch(bp, op->longName) || wildmatch(bp, shortname)) { + if (!op->longName && !*shortname) + break; + if ((op->longName && wildmatch(bp, op->longName)) + || (*shortname && wildmatch(bp, shortname))) { op->val = (op - long_options) + OPT_REFUSED_BASE; + found_match = 1; if (!is_wild) break; } } + if (!found_match) { + rprintf(FLOG, "No match for refuse-options string \"%s\"\n", + bp); + } if (!cp) break; *cp = ' '; -- 2.34.1