ip: allow using a device "help" (or a prefix thereof)
Device names that match "help" or a prefix thereof should be allowed anywhere
a device name can be used. Note that a suitable keyword ("dev" or "name", the
latter for "ip tunnel") has to be used in these cases to resolve ambiguities.
Signed-off-by: Christoph Schulz <develop@kristov.de>
Reported-by: Leonhard Preis <leonhard@pre.is>
Reported-by: Wilhelm Wijkander <lists@0x5e.se>
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index 62a8240..9884efd 100644
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -287,7 +287,7 @@
if (strcmp(*argv, "name") == 0) {
NEXT_ARG();
}
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (p->name[0])
duparg2("name", *argv);
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index e539847..e864ca6 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1580,7 +1580,7 @@
if (strcmp(*argv, "dev") == 0) {
NEXT_ARG();
}
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (filter_dev)
duparg2("dev", *argv);
diff --git a/ip/iplink.c b/ip/iplink.c
index 1c45205..f30de86 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -1148,8 +1148,7 @@
} else {
if (strcmp(*argv, "dev") == 0)
NEXT_ARG();
-
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (dev)
diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index a77a18f..cbd6d11 100644
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -257,7 +257,7 @@
if (strcmp(*argv, "dev") == 0) {
NEXT_ARG();
}
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (filter.dev)
duparg2("dev", *argv);