Add ip command aliases and better matching

diff --git a/ChangeLog b/ChangeLog
index cd70102d5e5322f9c52be007fedfdff39fcd5c17..4a062cc39e556e945d06dd1144f39f7284629897 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-22  Stephen Hemminger  <shemminger@osdl.org
+
+       * Handle ambigious ip command matches
+
+2005-11-22  Patrick McHardy <kaber@trash.net>
+
+       * Add back ip command aliases
+
 2005-11-07  Masahide NAKAMURA <nakam@linux-ipv6.org>
 
        * Updating for 2.6.14

diff --git a/ip/ip.c b/ip/ip.c
index 24f5c8efd7bf918abf62ab623c2bcbdbf1ec5cc8..df6bc10b3dd544d0b19bb85651bf0d6dbc47363d 100644 (file)
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -62,13 +62,15 @@ static const struct cmd {
        const char *cmd;
        int (*func)(int argc, char **argv);
 } cmds[] = {
-       { "addr",       do_ipaddr },
-       { "maddr",      do_multiaddr },
+       { "address",    do_ipaddr },
+       { "maddress",   do_multiaddr },
        { "route",      do_iproute },
        { "rule",       do_iprule },
-       { "neigh",      do_ipneigh },
+       { "neighbor",   do_ipneigh },
+       { "neighbour",  do_ipneigh },
        { "link",       do_iplink },
        { "tunnel",     do_iptunnel },
+       { "tunl",       do_iptunnel },
        { "monitor",    do_ipmonitor },
        { "xfrm",       do_xfrm },
        { "mroute",     do_multiroute },
@@ -78,14 +80,25 @@ static const struct cmd {
 
 static int do_cmd(const char *argv0, int argc, char **argv)
 {
-       const struct cmd *c;
+       const struct cmd *c, *m = NULL;
+
+       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;
+               }
+       }
 
-       for (c = cmds; c->cmd; ++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);
-       exit(-1);
+       return -1;
 }
 
 static int batch(const char *name)