X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fwait.cc;h=f934f5b388860f2f583c0d14e31e40385c3d9778;hb=7d698ad128550cb4d2e3a60c83533c4370efd106;hp=932659169e228a99272ed8dd846d5d97d46881ac;hpb=7abcaebdc4c3dd11b779eaef58a7371fb82ae888;p=m6w6%2Flibmemcached

diff --git a/libtest/wait.cc b/libtest/wait.cc
index 93265916..f934f5b3 100644
--- a/libtest/wait.cc
+++ b/libtest/wait.cc
@@ -1,9 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  All rights reserved.
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -38,17 +37,158 @@
 #include <config.h>
 
 #include <cstdlib>
+#include <fcntl.h>
+#include <getopt.h>
+#include <iostream>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 #include <libtest/wait.h>
 
+static void version_command(const char *command_name, int major_version, int minor_version)
+{
+  std::cout << command_name << " " << major_version << "." << minor_version << std::endl;
+}
+
+static void help_command(const char *command_name,
+                         int major_version, int minor_version,
+                         const struct option *long_options)
+{
+  std::cout << command_name << " " << major_version << "." << minor_version << std::endl;
+  std::cout << "Current options. A '=' means the option takes a value." << std::endl << std::endl;
+
+  for (uint32_t x= 0; long_options[x].name; x++)
+  {
+    std::cout << "\t --" << long_options[x].name << char(long_options[x].has_arg ? '=' : ' ') << std::endl;
+  }
+
+  std::cout << std::endl;
+}
+
+static void close_stdio(void)
+{
+  int fd;
+  if ((fd = open("/dev/null", O_RDWR, 0)) < 0)
+  {
+    return;
+  }
+  else
+  {
+    if (dup2(fd, STDIN_FILENO) < 0)
+    {
+      return;
+    }
+
+    if (dup2(fd, STDOUT_FILENO) < 0)
+    {
+      return;
+    }
+
+    if (dup2(fd, STDERR_FILENO) < 0)
+    {
+      return;
+    }
+
+    if (fd > STDERR_FILENO)
+    {
+      close(fd);
+    }
+  }
+}
+
+enum {
+  OPT_HELP,
+  OPT_QUIET,
+  OPT_VERSION
+};
+
+static void options_parse(int argc, char *argv[])
+{
+  static struct option long_options[]=
+  {
+    { "version", no_argument, NULL, OPT_VERSION},
+    { "help", no_argument, NULL, OPT_HELP},
+    { "quiet", no_argument, NULL, OPT_QUIET},
+    {0, 0, 0, 0},
+  };
+
+  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, "", long_options, &option_index);
+    if (option_rv == -1) 
+    {
+      break;
+    }
+
+    switch (option_rv)
+    {
+    case OPT_HELP: /* --help or -h */
+      opt_help= true;
+      break;
+
+    case OPT_VERSION: /* --version or -v */
+      opt_version= true;
+      break;
+
+    case OPT_QUIET:
+      opt_quiet= true;
+      break;
+
+    case '?':
+      /* getopt_long already printed an error message. */
+      exit(EXIT_FAILURE);
+
+    default:
+      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);
+    exit(EXIT_SUCCESS);
+  }
+
+  if (opt_help)
+  {
+    help_command(argv[0], 1, 0, long_options);
+    exit(EXIT_SUCCESS);
+  }
+}
+
 int main(int argc, char *argv[])
 {
-  if (argc == 2)
+  if (argc == 1)
+  {
+    return EXIT_FAILURE;
+  }
+
+  options_parse(argc, argv);
+
+  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;
 }