trace: Unwrap all args before serializing them.

[apitrace] / cli / cli_main.cpp

diff --git a/cli/cli_main.cpp b/cli/cli_main.cpp
index 981f39e416f2a514dc6de1123f3c0451835acf22..040adcf82928c56f8a35b76617ddeb72b11e1689 100644 (file)
--- a/cli/cli_main.cpp
+++ b/cli/cli_main.cpp
@@ -66,7 +66,16 @@ const Command help_command = {
 };
 
 static const Command * commands[] = {
+    &diff_command,
+    &diff_state_command,
+    &diff_images_command,
     &dump_command,
+    &dump_images_command,
+    &pickle_command,
+    &repack_command,
+    &retrace_command,
+    &trace_command,
+    &trim_command,
     &help_command
 };
 
@@ -115,12 +124,12 @@ do_help_command(int argc, char *argv[])
     const Command *command;
     int i;
 
-    if (argc != 1) {
+    if (argc != 2) {
         help_usage();
         return 0;
     }
 
-    char *command_name = argv[0];
+    char *command_name = argv[1];
 
     for (i = 0; i < ARRAY_SIZE(commands); i++) {
         command = commands[i];
@@ -165,7 +174,7 @@ main(int argc, char **argv)
         return 1;
     }
 
-    command_name = argv[i++];
+    command_name = argv[i];
 
     argc -= i;
     argv = &argv[i];
@@ -180,5 +189,5 @@ main(int argc, char **argv)
     std::cerr << "Error: unknown command " << command_name
               << " (see \"apitrace help\").\n";
 
-    return 1;
+   return 1;
 }