From: David Fifield <david@bamsoftware.com>
Date: Wed, 13 Mar 2013 07:43:21 +0000 (-0700)
Subject: Use option name --test-commandline in tor-fw-helper.
X-Git-Tag: tor-0.2.4.12-alpha~5^2~32^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03efe54027e214be51f5cb4bafcbbd57422da7a1;p=thirdparty%2Ftor.git

Use option name --test-commandline in tor-fw-helper.

It was previously --Test in the help output and --test-commandline in
the getopt call. The man page already had --test.

  (Originally by David, who resolved the tie in favor of "--test"; I
   chose --test-commandline" instead so that nothing that depended
   on it could break. -Nick)
---

diff --git a/changes/bug7768 b/changes/bug7768
index f523b5b771..e3f9600afb 100644
--- a/changes/bug7768
+++ b/changes/bug7768
@@ -1,3 +1,3 @@
   o Documentation fixes:
-    - Update tor-fw-helper.1.txt to describe its options with their
-      correct names. Fixes bug 7768.
+    - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option
+      names match. Fixes bug 7768.
diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c
index d92445e08f..488fe67419 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper.c
@@ -97,7 +97,7 @@ usage(void)
 {
   fprintf(stderr, "tor-fw-helper usage:\n"
           " [-h|--help]\n"
-          " [-T|--Test]\n"
+          " [-T|--test-commandline]\n"
           " [-v|--verbose]\n"
           " [-g|--fetch-public-ip]\n"
           " [-p|--forward-port ([<external port>]:<internal port>])\n");