Reinstate -h option, which disappeared at some point.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2420

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index a9181a6baae3add0dd6a7ade43ebe7d4f6faf6a8..fb4a1b7f30a6fc54c6022e334fabdfab705cc870 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1509,7 +1509,7 @@ void usage ( Bool debug_help )
 "\n"
 "  common user options for all Valgrind tools, with defaults in [ ]:\n"
 "    --tool=<name>             Use the Valgrind tool named <name>\n"
-"    --help                    show this message\n"
+"    -h --help                 show this message\n"
 "    --help-debug              show this message, plus debugging options\n"
 "    --version                 show version\n"
 "    -q --quiet                run silently; only print error msgs\n"
@@ -1616,7 +1616,8 @@ static void pre_process_cmd_line_options
          printf("valgrind-" VERSION "\n");
          exit(0);
 
-      } else if (VG_CLO_STREQ(VG_(vg_argv)[i], "--help")) {
+      } else if (VG_CLO_STREQ(VG_(vg_argv)[i], "--help") ||
+                 VG_CLO_STREQ(VG_(vg_argv)[i], "-h")) {
          *need_help = 1;
 
       } else if (VG_CLO_STREQ(VG_(vg_argv)[i], "--help-debug")) {

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 751eb8fb8016613382f542680aec3ed382c549b5..28f019814fe225aa508e7278d2b9d55c67bb4ec9 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -2,7 +2,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
 
   common user options for all Valgrind tools, with defaults in [ ]:
     --tool=<name>             Use the Valgrind tool named <name>
-    --help                    show this message
+    -h --help                 show this message
     --help-debug              show this message, plus debugging options
     --version                 show version
     -q --quiet                run silently; only print error msgs

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 1d9648329205d330bfdb40f20eb78e5fb419d1fb..bfad3504f2797324e38fd43a60808cfabdb39f08 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -2,7 +2,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
 
   common user options for all Valgrind tools, with defaults in [ ]:
     --tool=<name>             Use the Valgrind tool named <name>
-    --help                    show this message
+    -h --help                 show this message
     --help-debug              show this message, plus debugging options
     --version                 show version
     -q --quiet                run silently; only print error msgs