talons

commit ab495a8736c5b246219f9818b12bbcab3b3b24d0
parent 8d98fa6af2099ebb49beea2c1092d9efa490f0ff
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 14 Nov 2012 12:33:33 +0000

2012-11-14 [colin]	3.8.1cvs121

	* src/action.c
		And fix warning with breaking functionality

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/action.c
 | 
11
++++++++---

4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-14 [colin]	3.8.1cvs121
+
+	* src/action.c
+		And fix warning with breaking functionality
+
 2012-11-14 [paul]	3.8.1cvs120
 
 	* src/action.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4495,3 +4495,4 @@
 ( cvs diff -u -r 1.94.2.240 -r 1.94.2.241 src/messageview.c;  ) > 3.8.1cvs118.patchset
 ( cvs diff -u -r 1.13.2.46 -r 1.13.2.47 src/common/plugin.c;  ) > 3.8.1cvs119.patchset
 ( cvs diff -u -r 1.12.2.75 -r 1.12.2.76 src/action.c;  ) > 3.8.1cvs120.patchset
+( cvs diff -u -r 1.12.2.76 -r 1.12.2.77 src/action.c;  ) > 3.8.1cvs121.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=120
+EXTRA_VERSION=121
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/action.c b/src/action.c
@@ -973,18 +973,23 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
 				     ACTION_USER_IN |
 				     ACTION_USER_HIDDEN_IN)) {
 					r |= close(fileno(stdin));
-					(void) dup  (chld_in[0]);
+					if (dup(chld_in[0]) < 0)
+						r = -1;
 				}
 				r |= close(chld_in[0]);
 				r |= close(chld_in[1]);
 
 				r |= close(fileno(stdout));
-				(void) dup  (chld_out[1]);
+				if (dup(chld_out[1]) < 0)
+					r = -1;
+
 				r |= close(chld_out[0]);
 				r |= close(chld_out[1]);
 
 				r |= close(fileno(stderr));
-				(void) dup  (chld_err[1]);
+				if (dup(chld_err[1]) < 0)
+					r = -1;
+
 				r |= close(chld_err[0]);
 				r |= close(chld_err[1]);