* [PATCH] iproute2: man page and /bin/ip disagree on del vs delete
[not found] <20120518012928.26883.11644.reportbug@linear.rut.org>
@ 2012-05-19 14:08 ` Andreas Henriksson
2012-05-21 22:17 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Henriksson @ 2012-05-19 14:08 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Robert Henney, 673355, netdev
On Thu, May 17, 2012 at 09:29:28PM -0400, Robert Henney wrote:
> 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 d5bee36..c9720eb 100644
--- 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 c5683f5..3a5f94b 100644
--- 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 3d41a27..38ccd87 100644
--- 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 29f2777..20914e1 100644
--- 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 ||
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iproute2: man page and /bin/ip disagree on del vs delete
2012-05-19 14:08 ` [PATCH] iproute2: man page and /bin/ip disagree on del vs delete Andreas Henriksson
@ 2012-05-21 22:17 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2012-05-21 22:17 UTC (permalink / raw)
To: Andreas Henriksson; +Cc: Robert Henney, 673355, netdev
On Sat, 19 May 2012 16:08:21 +0200
Andreas Henriksson <andreas@fatal.se> wrote:
> On Thu, May 17, 2012 at 09:29:28PM -0400, Robert Henney wrote:
> > 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 d5bee36..c9720eb 100644
> --- 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 c5683f5..3a5f94b 100644
> --- 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 3d41a27..38ccd87 100644
> --- 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 29f2777..20914e1 100644
> --- 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 ||
Applied (for 3.5)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-21 22:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20120518012928.26883.11644.reportbug@linear.rut.org>
2012-05-19 14:08 ` [PATCH] iproute2: man page and /bin/ip disagree on del vs delete Andreas Henriksson
2012-05-21 22:17 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).