rpms/net-tools/devel net-tools-1.60-i-option.patch,1.1,1.2

[Zdenek Prikryl (zprikryl)]

Author: zprikryl

Update of /cvs/extras/rpms/net-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5757

Modified Files:
	net-tools-1.60-i-option.patch 
Log Message:
Changed behavior of --interfaces option according to RHEL


net-tools-1.60-i-option.patch:

Index: net-tools-1.60-i-option.patch
===================================================================
RCS file: /cvs/extras/rpms/net-tools/devel/net-tools-1.60-i-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- net-tools-1.60-i-option.patch	10 Jul 2008 08:33:33 -0000	1.1
+++ net-tools-1.60-i-option.patch	10 Jul 2008 12:44:34 -0000	1.2
@@ -1,11 +1,30 @@
---- net-tools-1.60/netstat.c.i-option	2008-07-08 10:22:51.000000000 +0200
-+++ net-tools-1.60/netstat.c	2008-07-08 10:22:56.000000000 +0200
-@@ -2084,7 +2084,7 @@ int main
-     {
+--- net-tools-1.60/netstat.c.i-option	2008-07-10 10:56:29.000000000 +0200
++++ net-tools-1.60/netstat.c	2008-07-10 13:46:27.000000000 +0200
+@@ -2042,7 +2042,7 @@ static void usage(void)
+     fprintf(stderr, _("       netstat { [-veenNac] -I[<Iface>] | [-veenNac] -i | [-cnNe] -M | -s } [delay]\n\n"));
+ 
+     fprintf(stderr, _("        -r, --route                display routing table\n"));
+-    fprintf(stderr, _("        -I, --interface=[<Iface>] display interface table for <Iface>\n"));
++    fprintf(stderr, _("        -I, --interfaces=<Iface>   display interface table for <Iface>\n"));
+     fprintf(stderr, _("        -i, --interfaces           display interface table\n"));
+     fprintf(stderr, _("        -g, --groups               display multicast group memberships\n"));
+     fprintf(stderr, _("        -s, --statistics           display networking statistics (like SNMP)\n"));
+@@ -2085,7 +2085,6 @@ int main
  	AFTRANS_OPTS,
  	{"version", 0, 0, 'V'},
--	{"interfaces", 2, 0, 'I'},
-+	{"interface", 2, 0, 'I'},
- 	{"interfaces", 0, 0, 'i'},
+ 	{"interfaces", 2, 0, 'I'},
+-	{"interfaces", 0, 0, 'i'},
  	{"help", 0, 0, 'h'},
  	{"route", 0, 0, 'r'},
+ #if HAVE_FW_MASQUERADE
+@@ -2173,10 +2172,6 @@ int main
+         	if (optarg[0] == '=') optarg++;
+             if (optarg && strcmp(optarg, "(null)")) 
+             	flag_int_name = strdup(optarg);
+-            else {
+-            	usage();
+-            	exit(1);
+-            }
+ 	    flag_int++;
+ 	    break;
+ 	case 'i':