From: Richard Jones <rjones@trick.home.annexia.org>
Date: Wed, 19 Aug 2009 08:37:44 +0000 (+0100)
Subject: guestfs_launch: Correct checks for dup failure.
X-Git-Tag: 1.0.68~11
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=8f1b06f64807239d4b4c923af4db8626a866ff6f;p=libguestfs.git

guestfs_launch: Correct checks for dup failure.
---

diff --git a/src/guestfs.c b/src/guestfs.c
index 58a0354..04bd4e8 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1165,16 +1165,16 @@ guestfs_launch (guestfs_h *g)
     close (wfd[1]);
     close (rfd[0]);
 
-    int fail = 0;
-    fail |= dup (wfd[0]);
-    fail |= dup (rfd[1]);
-    close (wfd[0]);
-    close (rfd[1]);
-
-    if (fail) {
+    if (dup (wfd[0]) == -1) {
+    dup_failed:
       perror ("dup failed");
       _exit (1);
     }
+    if (dup (rfd[1]) == -1)
+      goto dup_failed;
+
+    close (wfd[0]);
+    close (rfd[1]);
 
 #if 0
     /* Set up a new process group, so we can signal this process