Merge lp:~brianaker/gearmand/waitpid into lp:gearmand

[Brian Aker]

=== modified file 'libtest/cmdline.cc'
--- libtest/cmdline.cc	2013-06-02 09:00:13 +0000
+++ libtest/cmdline.cc	2013-06-28 04:42:27 +0000
@@ -437,9 +437,26 @@
 #pragma GCC diagnostic ignored "-Wunreachable-code"
 Application::error_t Application::join()
 {
-  pid_t waited_pid= waitpid(_pid, &_status, 0);
+  if (waitpid(_pid, &_status, 0) == -1)
+  {
+    std::string error_string;
+    if (stdout_result_length())
+    {
+      error_string+= " stdout: ";
+      error_string+= stdout_c_str();
+    }
+
+    if (stderr_result_length())
+    {
+      error_string+= " stderr: ";
+      error_string+= stderr_c_str();
+    }
+    Error << "waitpid() returned errno:" << strerror(errno) << " " << error_string;
+    return Application::UNKNOWN;
+  }
+
   slurp();
-  if (waited_pid == _pid and WIFEXITED(_status) == false)
+  if (WIFEXITED(_status) == false)
   {
     /*
       What we are looking for here is how the exit status happened.
@@ -504,26 +521,9 @@
         << " name:" << built_argv[0];
     }
   }
-  else if (waited_pid == _pid and WIFEXITED(_status))
-  {
-    _app_exit_state= int_to_error_t(WEXITSTATUS(_status));
-  }
-  else if (waited_pid == -1)
-  {
-    std::string error_string;
-    if (stdout_result_length())
-    {
-      error_string+= " stdout: ";
-      error_string+= stdout_c_str();
-    }
-
-    if (stderr_result_length())
-    {
-      error_string+= " stderr: ";
-      error_string+= stderr_c_str();
-    }
-    Error << "waitpid() returned errno:" << strerror(errno) << " " << error_string;
-    _app_exit_state= Application::UNKNOWN;
+  else if (WIFEXITED(_status))
+  {
+    return int_to_error_t(WEXITSTATUS(_status));
   }
   else
   {
 
=== modified file 'util/daemon.cc'
--- util/daemon.cc	2012-10-28 20:04:35 +0000
+++ util/daemon.cc	2013-06-28 04:42:27 +0000
@@ -152,16 +152,16 @@
       /* parent */
       int exit_code= EXIT_FAILURE;
       int status;
-      while (waitpid(child, &status, 0) != child)
-      { }
-
-      if (WIFEXITED(status))
-      {
-        exit_code= WEXITSTATUS(status);
-      }
-      if (WIFSIGNALED(status))
-      {
-        exit_code= EXIT_FAILURE;
+      if  (waitpid(child, &status, 0) != -1)
+      {
+        if (WIFEXITED(status))
+        {
+          exit_code= WEXITSTATUS(status);
+        }
+        if (WIFSIGNALED(status))
+        {
+          exit_code= EXIT_FAILURE;
+        }
       }
       _exit(exit_code);
     }