2012-11-14 [paul] 3.8.1cvs120

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

diff --git a/ChangeLog b/ChangeLog
index 0552c0e50e9b35dda92ccb6f262cadd48d0d5174..64af52241d1b63579c10d2bba092616c318df06d 100644 (file)
--- 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
index 0cc36364987e9ac37cadfcc530362c86ceb74fda..8f3644413955110b6b7a8abf4b1b182a9b9c54a9 100644 (file)
--- 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
index 54f735f77588ffc2d6b8f1720d658121d08349e2..14a67317d9d7a8e0a8d72483ecd94ad523a2c7af 100644 (file)
--- 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
index 163652a6c9fc7f4f1d3e94b8e661217a9620181a..2d772e648f36afab0c7be45a5495efbfab4c5e69 100644 (file)
--- 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]);