matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backout ambigious error for ip

This commit is contained in:
shemminger 2005-12-02 20:02:26 +00:00
parent ede723964a
commit e25d697069
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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 2005-11-22 Stephen Hemminger <shemminger@osdl.org
* Handle ambigious ip command matches * Handle ambigious ip command matches

16
ip/ip.c
View File

@ -80,23 +80,13 @@ static const struct cmd {
static int do_cmd(const char *argv0, int argc, char **argv) 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) { for (c = cmds; c->cmd; ++c) {
if (matches(argv0, c->cmd) == 0) { if (matches(argv0, c->cmd) == 0)
if (m && m->func != c->func) { return c->func(argc-1, argv+1);
fprintf(stderr,
"Ambiguious command \"%s\" matches both %s and %s\n",
argv0, m->cmd, c->cmd);
return -1;
}
m = c;
}
} }
if (m)
return m->func(argc-1, argv+1);
fprintf(stderr, "Object \"%s\" is unknown, try \"ip help\".\n", argv0); fprintf(stderr, "Object \"%s\" is unknown, try \"ip help\".\n", argv0);
return -1; return -1;
} }