PR/514: David Macek: Don't fail to handle uncompress when stdin is closed

and 0 holds the descriptor to the input file.

diff --git a/src/compress.c b/src/compress.c
index 7f0ef176ee60e5292bfaa553d19f6ca2db01fc1b..bf9897be0363a231b255161dfd8dc5fda9b56019 100644 (file)
--- a/src/compress.c
+++ b/src/compress.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: compress.c,v 1.90 2015/11/13 15:35:10 christos Exp $")
+FILE_RCSID("@(#)$File: compress.c,v 1.91 2015/11/13 15:42:18 christos Exp $")
 #endif
 
 #include "magic.h"
@@ -555,10 +555,11 @@ closep(int *fd)
 static void
 copydesc(int i, int *fd)
 {
-       (void) close(i);
-       if (dup(fd[i == STDIN_FILENO ? 0 : 1]) == -1) {
-               abort();
-               DPRINTF("dup[%d] failed (%s)\n", i, strerror(errno));
+       int j = fd[i == STDIN_FILENO ? 0 : 1];
+       if (j == i)
+               return;
+       if (dup2(j, i) == -1) {
+               DPRINTF("dup(%d, %d) failed (%s)\n", j, i, strerror(errno));
                exit(1);
        }
        closep(fd);