X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fwait.cc;h=d1292e188fb8b40c76acf1b7076e1f090d0f847a;hb=d169e8c62f8ca4fe7d058d8e2254426105032b7e;hp=cf2277e6d94e58a71a9a5e32f8a0e35495ecfbdf;hpb=21e3df27efdf2bad8cdcfb480a964e38060527b1;p=awesomized%2Flibmemcached

diff --git a/libtest/wait.cc b/libtest/wait.cc
index cf2277e6..d1292e18 100644
--- a/libtest/wait.cc
+++ b/libtest/wait.cc
@@ -1,25 +1,40 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 3 of the License, or (at your option) any later version.
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 
 #include <cstdlib>
 #include <fcntl.h>
@@ -34,7 +49,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 +64,6 @@ static void help_command(const char *command_name,
   }
 
   std::cout << std::endl;
-  exit(EXIT_SUCCESS);
 }
 
 static void close_stdio(void)
@@ -102,11 +115,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 +132,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 +170,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;
 }