commit ed91cd9ab32a3130bc2a4b15b0ac3cfca58c259f
author Yabin Cui <yabinc@google.com> Tue Apr 28 15:54:13 2015 -0700
committer Yabin Cui <yabinc@google.com> Wed May 13 18:26:05 2015 -0700
tree 008b2831764b34878cd3191c05d1c7eaf3dfb692
parent f2392997221777282197127c5febf65d8cc699ea

Implement simpleperf record/dumprecord subcommands.

(cherry picked from commit 9759e1b1ce76185aa539aeea2fb1cbd8382156e7)

Bug: 19483574

Change-Id: Id879713a75c2d3a6289d8847b95ee0bb4a2cc8a0

simpleperf/main.cpp

diff --git a/simpleperf/main.cpp b/simpleperf/main.cpp
index 1f7c7da..173026e 100644
--- a/simpleperf/main.cpp
+++ b/simpleperf/main.cpp
@@ -26,11 +26,15 @@
   InitLogging(argv, android::base::StderrLogger);
   std::vector<std::string> args;
 
-  if (argc == 1 || (argc == 2 && strcmp(argv[1], "--help") == 0)) {
+  if (argc == 1) {
     args.push_back("help");
   } else {
     for (int i = 1; i < argc; ++i) {
-      args.push_back(argv[i]);
+      if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) {
+        args.insert(args.begin(), "help");
+      } else {
+        args.push_back(argv[i]);
+      }
     }
   }
 
@@ -40,7 +44,6 @@
     return 1;
   }
   std::string command_name = args[0];
-  args.erase(args.begin());
 
   LOG(DEBUG) << "command '" << command_name << "' starts running";
   bool result = command->Run(args);