[Valgrind-developers] valgrind

[Nicholas N. <nj...@ca...>]

CVS commit by nethercote: 


Reinstate -h option, which disappeared at some point.


  M +3 -2      coregrind/vg_main.c   1.154
  M +1 -1      none/tests/cmdline1.stdout.exp   1.3
  M +1 -1      none/tests/cmdline2.stdout.exp   1.3


--- valgrind/coregrind/vg_main.c  #1.153:1.154
@@ -1510,5 +1510,5 @@ void usage ( Bool debug_help )
 "  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"
@@ -1617,5 +1617,6 @@ static void pre_process_cmd_line_options
          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;
 

--- valgrind/none/tests/cmdline1.stdout.exp  #1.2:1.3
@@ -3,5 +3,5 @@
   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

--- valgrind/none/tests/cmdline2.stdout.exp  #1.2:1.3
@@ -3,5 +3,5 @@
   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