summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Eriksson <feffe@winterbird.org>2012-11-05 17:30:19 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2012-11-10 10:17:57 +0100
commit8a16124b84e908dfd979b4c8489d39023a7e2631 (patch)
tree871155434634e996e35d272cf9139b1c9d02294a
parentc52cf6000923b6a5c6416360d9425061dd19424d (diff)
Fix interactive mode
Catching interactive mode got broken in 6.12.
-rw-r--r--src/ui.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ui.c b/src/ui.c
index ef722c7..fb378ba 100644
--- 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;