Merge working tree with build tree.

[m6w6/libmemcached] / libtest / wait.cc

diff --git a/libtest/wait.cc b/libtest/wait.cc
index cf2277e6d94e58a71a9a5e32f8a0e35495ecfbdf..79659664409ce35edfe2964ae19188f307775084 100644 (file)
--- a/libtest/wait.cc
+++ b/libtest/wait.cc
@@ -34,7 +34,6 @@
 static void version_command(const char *command_name, int major_version, int minor_version)
 {
   std::cout << command_name << " " << major_version << "." << minor_version << std::endl;
-  exit(EXIT_SUCCESS);
 }
 
 static void help_command(const char *command_name,
@@ -50,7 +49,6 @@ static void help_command(const char *command_name,
   }
 
   std::cout << std::endl;
-  exit(EXIT_SUCCESS);
 }
 
 static void close_stdio(void)
@@ -102,11 +100,12 @@ static void options_parse(int argc, char *argv[])
 
   bool opt_version= false;
   bool opt_help= false;
+  bool opt_quiet= false;
   int option_index= 0;
 
   while (1)
   {
-    int option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
+    int option_rv= getopt_long(argc, argv, "", long_options, &option_index);
     if (option_rv == -1) 
     {
       break;
@@ -118,19 +117,29 @@ static void options_parse(int argc, char *argv[])
       opt_help= true;
       break;
 
+    case OPT_VERSION: /* --version or -v */
+      opt_version= true;
+      break;
+
     case OPT_QUIET:
-      close_stdio();
+      opt_quiet= true;
       break;
 
     case '?':
       /* getopt_long already printed an error message. */
-      exit(EXIT_SUCCESS);
+      exit(EXIT_FAILURE);
 
     default:
-      abort();
+      help_command(argv[0], 1, 0, long_options);
+      exit(EXIT_FAILURE);
     }
   }
 
+  if (opt_quiet)
+  {
+    close_stdio();
+  }
+
   if (opt_version)
   {
     version_command(argv[0], 1, 0);
@@ -146,15 +155,25 @@ static void options_parse(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
+  if (argc == 1)
+  {
+    return EXIT_FAILURE;
+  }
+
   options_parse(argc, argv);
 
-  if (argc == 2)
+  int ret= EXIT_FAILURE;
+  while (optind < argc)
   {
-    libtest::Wait wait(argv[1]);
+    libtest::Wait wait(argv[optind++]);
+
+    if (wait.successful() == false)
+    {
+      return EXIT_FAILURE;
+    }
 
-    if (wait.successful())
-      return EXIT_SUCCESS;
+    ret= EXIT_SUCCESS;
   }
 
-  return EXIT_FAILURE;
+  return ret;
 }