[Libguestfs] [PATCH] Correct checks for dup failure in guestfs_launch

[Richard W.M. Jones]

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
-------------- next part --------------
>From 8f1b06f64807239d4b4c923af4db8626a866ff6f Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Wed, 19 Aug 2009 09:37:44 +0100
Subject: [PATCH] guestfs_launch: Correct checks for dup failure.

---
 src/guestfs.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

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
-- 
1.6.2.5