Update exec to use the more traditional -h flag for help along with the common Windows' -?.

arr committed 9 years ago

Commit 1af55281 parent e9e85041 file · +6 −4Browse files

Showing the changes to src/exec/main.cpp (1 of 1 file). Show all

Unified · Split

 void print_help()
 {
     std::cout
-        << "Usage: disvm-exec [-d[e|m|x]*] [-l[s|S|t|T|e|g|m]*] [-t <num>] [-q] [-?] <entry module> <args>*\n"
+        << "Usage: disvm-exec [-d[e|m|x]*] [-l[s|S|t|T|e|g|m]*] [-t <num>] [-q] [-h] <entry module> <args>*\n"
            "    d - Enable debugger\n"
            "         e - Break on entry\n"
            "         m - Break on module load\n"
            "         m - Memory allocations (noisy)\n"
            "    q - Suppress banner and configuration\n"
            "    t - Specify the number of system threads to use (0 < x <= 4)\n"
-           "    ? - Print help\n";
+           "    h - Print help (alternative: '?')\n";
 }
 void log_callback(const debug::component_trace_t origin, const debug::log_level_t level, const char *msg_fmt, std::va_list args)
 void process_arg(char* arg, std::function<char *()> next, exec_options &options)
 {
     assert(arg != nullptr && next != nullptr);
-    if (arg[0] != '-')
+    if (arg[0] != '-' && arg[0] != '/')
     {
         for (; arg != nullptr; arg = next())
             options.vm_args.push_back(arg);
         options.quiet_start = true;
         break;
+    case 'h':
     case '?':
         options.print_help = true;
         break;
     {
         std::cerr << ae.what();
         if (ae.arg != nullptr)
-            std::cerr << ": " << ae.arg << std::endl;
+            std::cerr << ": " << ae.arg << "\n" << std::endl;
+        print_help();
         return EXIT_FAILURE;
     }