commit 9069817033c4f588f733292a18e8e6feaf9d83d2
author Chris Webb <chris@arachsys.com> Thu Aug 16 21:42:37 2012 +0100
committer Stephen Hemminger <shemminger@vyatta.com> Thu Aug 16 14:02:46 2012 -0700
tree 57c27452856974fe123c9dceae2fa97c8b972cb0
parent c487348a9c009260b9b1d2f8530873e9bda7d9b5

Correct the bridge command name in help messages

The bridge command used to be called br but was renamed bridge. Correct
the outdated references to the br name in the help messages, together with a
typo of '-help' for 'help'.

Signed-off-by: Chris Webb <chris@arachsys.com>

bridge/bridge.c

diff --git a/bridge/bridge.c b/bridge/bridge.c
index 9e5f69c..4702340 100644
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -25,7 +25,7 @@
 static void usage(void)
 {
 	fprintf(stderr,
-"Usage: br [ OPTIONS ] OBJECT { COMMAND | help }\n"
+"Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\n"
 "where  OBJECT := { fdb |  monitor }\n"
 "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails]\n" );
 	exit(-1);
@@ -56,7 +56,7 @@
 			return c->func(argc-1, argv+1);
 	}
 
-	fprintf(stderr, "Object \"%s\" is unknown, try \"br help\".\n", argv0);
+	fprintf(stderr, "Object \"%s\" is unknown, try \"bridge help\".\n", argv0);
 	return -1;
 }
 
@@ -77,7 +77,7 @@
 		if (matches(opt, "-help") == 0) {
 			usage();
 		} else if (matches(opt, "-Version") == 0) {
-			printf("br utility, 0.0\n");
+			printf("bridge utility, 0.0\n");
 			exit(0);
 		} else if (matches(opt, "-stats") == 0 ||
 			   matches(opt, "-statistics") == 0) {
@@ -87,7 +87,7 @@
 		} else if (matches(opt, "-timestamp") == 0) {
 			++timestamp;
 		} else {
-			fprintf(stderr, "Option \"%s\" is unknown, try \"br -help\".\n", opt);
+			fprintf(stderr, "Option \"%s\" is unknown, try \"bridge help\".\n", opt);
 			exit(-1);
 		}
 		argc--;	argv++;

bridge/fdb.c

diff --git a/bridge/fdb.c b/bridge/fdb.c
index 04984f1..2bbdaa6 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -26,8 +26,8 @@
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: br fdb { add | del | replace } ADDR dev DEV\n");
-	fprintf(stderr, "       br fdb {show} [ dev DEV ]\n");
+	fprintf(stderr, "Usage: bridge fdb { add | del | replace } ADDR dev DEV\n");
+	fprintf(stderr, "       bridge fdb {show} [ dev DEV ]\n");
 	exit(-1);
 }
 

bridge/monitor.c

diff --git a/bridge/monitor.c b/bridge/monitor.c
index 37468e6..3790a84 100644
--- a/bridge/monitor.c
+++ b/bridge/monitor.c
@@ -1,5 +1,5 @@
 /*
- * brmonitor.c		"br monitor"
+ * brmonitor.c		"bridge monitor"
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: br monitor\n");
+	fprintf(stderr, "Usage: bridge monitor\n");
 	exit(-1);
 }
 
@@ -103,7 +103,7 @@
 		} else if (matches(*argv, "help") == 0) {
 			usage();
 		} else {
-			fprintf(stderr, "Argument \"%s\" is unknown, try \"br monitor help\".\n", *argv);
+			fprintf(stderr, "Argument \"%s\" is unknown, try \"bridge monitor help\".\n", *argv);
 			exit(-1);
 		}
 		argc--;	argv++;