X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5b2d69cc5b852ab2e884fdf76f78d2ee6ff3ff7f..0ffda363409da33824a5bfc52b8f65008a04438e:/lib/subpipe.c

diff --git a/lib/subpipe.c b/lib/subpipe.c
index 7bb520a8..10b62f2c 100644
--- a/lib/subpipe.c
+++ b/lib/subpipe.c
@@ -1,6 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com>
    and Florian Krohm <florian@edamail.fishkill.ibm.com>.  */
@@ -23,30 +23,16 @@
 # include <config.h>
 #endif
 
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include "subpipe.h"
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 #include <signal.h>
 #if ! defined SIGCHLD && defined SIGCLD
 # define SIGCHLD SIGCLD
 #endif
 
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-/* The following test is to work around the gross typo in
-   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
-   is defined to 0, not 1.  */
-#if ! EXIT_FAILURE
-# undef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+#include <stdlib.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -82,12 +68,11 @@ extern int errno;
 #endif
 
 #include "error.h"
+#include "unistd-safer.h"
 
 #include "gettext.h"
 #define _(Msgid)  gettext (Msgid)
 
-#include "subpipe.h"
-
 
 /* Initialize this module.  */
 
@@ -115,21 +100,16 @@ pid_t
 create_subpipe (char const * const *argv, int fd[2])
 {
   int pipe_fd[2];
-  int from_in_fd;
-  int from_out_fd;
-  int to_in_fd;
-  int to_out_fd;
+  int child_fd[2];
   pid_t pid;
 
-  if (pipe (pipe_fd) != 0)
+  if (pipe (child_fd) != 0
+      || (child_fd[0] = fd_safer (child_fd[0])) < 0
+      || (fd[0] = fd_safer (child_fd[1])) < 0
+      || pipe (pipe_fd) != 0
+      || (fd[1] = fd_safer (pipe_fd[0])) < 0
+      || (child_fd[1] = fd_safer (pipe_fd[1])) < 0)
     error (EXIT_FAILURE, errno, "pipe");
-  to_in_fd = pipe_fd[0];
-  to_out_fd = pipe_fd[1];
-
-  if (pipe (pipe_fd) != 0)
-    error (EXIT_FAILURE, errno, "pipe");
-  from_in_fd = pipe_fd[0];
-  from_out_fd = pipe_fd[1];
 
   pid = vfork ();
   if (pid < 0)
@@ -138,33 +118,24 @@ create_subpipe (char const * const *argv, int fd[2])
   if (! pid)
     {
       /* Child.  */
-      close (to_out_fd);
-      close (from_in_fd);
-
-      if (to_in_fd != STDIN_FILENO)
-	{
-	  dup2 (to_in_fd, STDIN_FILENO);
-	  close (to_in_fd);
-	}
-      if (from_out_fd != STDOUT_FILENO)
-	{
-	  dup2 (from_out_fd, STDOUT_FILENO);
-	  close (from_out_fd);
-	}
+      close (fd[0]);
+      close (fd[1]);
+      dup2 (child_fd[0], STDIN_FILENO);
+      close (child_fd[0]);
+      dup2 (child_fd[1], STDOUT_FILENO);
+      close (child_fd[1]);
 
       /* The cast to (char **) rather than (char * const *) is needed
 	 for portability to older hosts with a nonstandard prototype
 	 for execvp.  */
       execvp (argv[0], (char **) argv);
-    
+
       _exit (errno == ENOENT ? 127 : 126);
     }
 
   /* Parent.  */
-  close (to_in_fd);
-  close (from_out_fd);
-  fd[0] = to_out_fd;
-  fd[1] = from_in_fd;
+  close (child_fd[0]);
+  close (child_fd[1]);
   return pid;
 }