From 8a16124b84e908dfd979b4c8489d39023a7e2631 Mon Sep 17 00:00:00 2001
From: Fredrik Eriksson <feffe@winterbird.org>
Date: Mon, 5 Nov 2012 17:30:19 +0100
Subject: Fix interactive mode

Catching interactive mode got broken in 6.12.
---
 src/ui.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/ui.c')

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;
-- 
cgit v1.2.3