iproute2: man page and /bin/ip disagree on del vs delete

Reported by Robert Henney:
> the 'ip' man page does not mention the command "del" at all but does
> claim, "As a rule, it is possible to add, delete and show (or list ) objects".
> however, 'ip' does not always recognize "delete" as a commend.
>
> robh@debian:~$ ip tunnel delete
> Command "delete" is unknown, try "ip tunnel help".

Lets use "delete" in all calls to matches() for consistency. This will
make both "del" and "delete" work everywhere.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>

diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index d5bee3601583ebad93d40747174bfed7bba87e0e..c9720eb25b62781e11c47af1f30b797d6d8b9cba 100644 (file)
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -408,7 +408,7 @@ int do_ip6tunnel(int argc, char **argv)
                        return do_add(SIOCADDTUNNEL, argc - 1, argv + 1);
                if (matches(*argv, "change") == 0)
                        return do_add(SIOCCHGTUNNEL, argc - 1, argv + 1);
-               if (matches(*argv, "del") == 0)
+               if (matches(*argv, "delete") == 0)
                        return do_del(argc - 1, argv + 1);
                if (matches(*argv, "show") == 0 ||
                    matches(*argv, "lst") == 0 ||

diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
index c5683f567568fd2d131826231aeadfe573291f25..3a5f94b17a1fd9a0407b8142f3948a78eac031fe 100644 (file)
--- a/ip/ipl2tp.c
+++ b/ip/ipl2tp.c
@@ -795,7 +795,7 @@ int do_ipl2tp(int argc, char **argv)
 
        if (matches(*argv, "add") == 0)
                return do_add(argc-1, argv+1);
-       if (matches(*argv, "del") == 0)
+       if (matches(*argv, "delete") == 0)
                return do_del(argc-1, argv+1);
        if (matches(*argv, "show") == 0 ||
            matches(*argv, "lst") == 0 ||

diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 3d41a274cf196bb0d93bd3ece5b3790931be2d9b..38ccd87c7191bb53ab64770258904683af80c293 100644 (file)
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -620,7 +620,7 @@ int do_iptunnel(int argc, char **argv)
                        return do_add(SIOCADDTUNNEL, argc-1, argv+1);
                if (matches(*argv, "change") == 0)
                        return do_add(SIOCCHGTUNNEL, argc-1, argv+1);
-               if (matches(*argv, "del") == 0)
+               if (matches(*argv, "delete") == 0)
                        return do_del(argc-1, argv+1);
                if (matches(*argv, "show") == 0 ||
                    matches(*argv, "lst") == 0 ||

diff --git a/ip/iptuntap.c b/ip/iptuntap.c
index 29f2777e988ae274dffce07aa5559c4bf444c4fd..20914e11471fe84aa445ae616e36795a3ea2cf64 100644 (file)
--- a/ip/iptuntap.c
+++ b/ip/iptuntap.c
@@ -307,7 +307,7 @@ int do_iptuntap(int argc, char **argv)
        if (argc > 0) {
                if (matches(*argv, "add") == 0)
                        return do_add(argc-1, argv+1);
-               if (matches(*argv, "del") == 0)
+               if (matches(*argv, "delete") == 0)
                        return do_del(argc-1, argv+1);
                if (matches(*argv, "show") == 0 ||
                     matches(*argv, "lst") == 0 ||