From: shemminger <shemminger>
Date: Fri, 2 Dec 2005 20:02:26 +0000 (+0000)
Subject: Backout ambigious error for ip
X-Git-Tag: ss-060110~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e25d697069a1c3d5eb13a44050eeed5f007d31d4;p=thirdparty%2Fiproute2.git

Backout ambigious error for ip
---

diff --git a/ChangeLog b/ChangeLog
index 4a062cc39..7db8c6869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-02  Stephen Hemminger  <shemminger@osdl.org
+
+	* Backout ambigious ip command matches
+
 2005-11-22  Stephen Hemminger  <shemminger@osdl.org
 
 	* Handle ambigious ip command matches
diff --git a/ip/ip.c b/ip/ip.c
index df6bc10b3..590392555 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -80,23 +80,13 @@ static const struct cmd {
 
 static int do_cmd(const char *argv0, int argc, char **argv)
 {
-	const struct cmd *c, *m = NULL;
+	const struct cmd *c;
 
 	for (c = cmds; c->cmd; ++c) {
-		if (matches(argv0, c->cmd) == 0) {
-			if (m && m->func != c->func) {
-				fprintf(stderr, 
-					"Ambiguious command \"%s\" matches both %s and %s\n",
-					argv0,  m->cmd, c->cmd);
-				return -1;
-			}
-			m = c;
-		}
+		if (matches(argv0, c->cmd) == 0)
+			return c->func(argc-1, argv+1);
 	}
 
-	if (m) 
-		return m->func(argc-1, argv+1);
-
 	fprintf(stderr, "Object \"%s\" is unknown, try \"ip help\".\n", argv0);
 	return -1;
 }