From 49ec703c5121c4ee2215f920d2853ba80335c861 Mon Sep 17 00:00:00 2001 From: Zdenek Prikryl <zprikryl@fedoraproject.org> Date: Thu, 10 Jul 2008 12:44:34 +0000 Subject: [PATCH] Changed behavior of --interfaces option according to RHEL --- net-tools-1.60-i-option.patch | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/net-tools-1.60-i-option.patch b/net-tools-1.60-i-option.patch index 11d9c53..c88a496 100644 --- a/net-tools-1.60-i-option.patch +++ b/net-tools-1.60-i-option.patch @@ -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':