talons

commit 8d98fa6af2099ebb49beea2c1092d9efa490f0ff
parent fef080f9326aaf109858e62a9783087378e0046b
Author: Paul Mangan <paul@claws-mail.org>
Date:   Wed, 14 Nov 2012 11:20:56 +0000

2012-11-14 [paul]	3.8.1cvs120

	* src/action.c
		revert this change from 3.8.1cvs60, it breaks
		actions with a pipe

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

4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-14 [paul]	3.8.1cvs120
+
+	* src/action.c
+		revert this change from 3.8.1cvs60, it breaks
+		actions with a pipe
+
 2012-11-14 [colin]	3.8.1cvs119
 
 	* src/common/plugin.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4494,3 +4494,4 @@
 ( cvs diff -u -r 1.1.4.123 -r 1.1.4.124 src/etpan/imap-thread.c;  ) > 3.8.1cvs117.patchset
 ( 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
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=119
+EXTRA_VERSION=120
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/action.c b/src/action.c
@@ -973,15 +973,18 @@ 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]);
 				}
 				r |= close(chld_in[0]);
 				r |= close(chld_in[1]);
 
 				r |= close(fileno(stdout));
+				(void) dup  (chld_out[1]);
 				r |= close(chld_out[0]);
 				r |= close(chld_out[1]);
 
 				r |= close(fileno(stderr));
+				(void) dup  (chld_err[1]);
 				r |= close(chld_err[0]);
 				r |= close(chld_err[1]);