]> granicus.if.org Git - ipset/commitdiff
Fix interactive mode
authorFredrik Eriksson <feffe@winterbird.org>
Mon, 5 Nov 2012 16:30:19 +0000 (17:30 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Sat, 10 Nov 2012 09:17:57 +0000 (10:17 +0100)
Catching interactive mode got broken in 6.12.

src/ui.c

index ef722c73c90c3c3f7d0add3801322f6b7b34f002..fb378ba1ddff915fe13fc33ad801e5dc8f1947dd 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -138,15 +138,12 @@ ipset_match_cmd(const char *arg, const char * const name[])
                skip = 2;
 
        len = strlen(arg);
-       if (len <= skip)
+       if (len <= skip || (len == 1 && arg[0] == '-'))
                return false;
 
        for (i = 0; i < IPSET_CMD_ALIASES && name[i] != NULL; i++) {
-               /* Old compatibility command flags */
-               if (name[i][0] == '-' && STREQ(arg, name[i]))
-                       return true;
                /* New command name options */
-               if (strncmp(arg + skip, name[i], len - skip) == 0)
+               if (STRNEQ(arg + skip, name[i], len - skip))
                        return true;
        }
        return false;