2012-11-14 [colin] 3.8.1cvs121

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

diff --git a/ChangeLog b/ChangeLog
index 64af52241d1b63579c10d2bba092616c318df06d..fdf840fc14aa5295371f74bea0003d2526f20be1 100644 (file)
--- 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
index 8f3644413955110b6b7a8abf4b1b182a9b9c54a9..dc97536ad26e7f1935d12ecd3133bb6f8554120b 100644 (file)
--- 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
index 14a67317d9d7a8e0a8d72483ecd94ad523a2c7af..929c07aca7c9750610ed297dac4d31bf9f4f76d3 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=120
+EXTRA_VERSION=121
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/action.c b/src/action.c
index 2d772e648f36afab0c7be45a5495efbfab4c5e69..60dfc726a886cbff8f2c8b59f3d4d2250598e981 100644 (file)
--- 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]);