From c8d7fc216d79419e194168656bf75731c88cdd7d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 17 Jul 2012 08:06:20 -0400
Subject: [PATCH] core: Use g_spawn_check_exit_status()

---
 src/libotutil/ot-spawn-utils.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/libotutil/ot-spawn-utils.c b/src/libotutil/ot-spawn-utils.c
index 1dab0142..e1256614 100644
--- a/src/libotutil/ot-spawn-utils.c
+++ b/src/libotutil/ot-spawn-utils.c
@@ -25,7 +25,6 @@
 #include "otutil.h"
 
 #include <string.h>
-#include <sys/wait.h>
 
 gboolean
 ot_spawn_sync_checked (const char           *cwd,
@@ -50,27 +49,8 @@ ot_spawn_sync_checked (const char           *cwd,
                      error))
     goto out;
   
-  if (WIFEXITED (exit_status))
-    {
-      if (WEXITSTATUS (exit_status) != 0)
-        {
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Exited with code %d", WEXITSTATUS (exit_status));
-          goto out;
-        }
-    }
-  else if (WIFSIGNALED (exit_status))
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Killed by signal %d", WTERMSIG (exit_status));
-      goto out;
-    }
-  else
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Exited abnormally");
-      goto out;
-    }
+  if (!g_spawn_check_exit_status (exit_status, error))
+    goto out;
 
   ret = TRUE;
  out: