ChangeLog (2006-09-15): add Odd Arild Olsen's role for push.c.

[bison.git] / lib / subpipe.c

diff --git a/lib/subpipe.c b/lib/subpipe.c
index 8722bac0350757b9fc70000998dff0b87dfa52f3..1b7c36d8e32f8d895621aa38d19b9a4a2729cb65 100644 (file)
--- a/lib/subpipe.c
+++ b/lib/subpipe.c
@@ -1,11 +1,12 @@
 /* Subprocesses with pipes.
 
 /* Subprocesses with pipes.
 

-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2006, 2009-2010 Free Software Foundation,
+   Inc.

 
 

-   This program is free software; you can redistribute it and/or modify
+   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
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -13,15 +14,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* Written by Paul Eggert <eggert@twinsun.com>
    and Florian Krohm <florian@edamail.fishkill.ibm.com>.  */
 
 
 /* Written by Paul Eggert <eggert@twinsun.com>
    and Florian Krohm <florian@edamail.fishkill.ibm.com>.  */
 

-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>

 
 #include "subpipe.h"
 
 
 #include "subpipe.h"
 


@@ -34,9 +32,7 @@
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>

 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
 #endif
 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
 #endif


@@ -44,9 +40,7 @@
 # define STDOUT_FILENO 1
 #endif
 #if ! HAVE_DUP2 && ! defined dup2
 # define STDOUT_FILENO 1
 #endif
 #if ! HAVE_DUP2 && ! defined dup2

-# if HAVE_FCNTL_H
-#  include <fcntl.h>
-# endif
+# include <fcntl.h>

 # define dup2(f, t) (close (t), fcntl (f, F_DUPFD, t))
 #endif
 
 # define dup2(f, t) (close (t), fcntl (f, F_DUPFD, t))
 #endif
 


@@ -68,10 +62,23 @@
 #endif
 
 #include "error.h"
 #endif
 
 #include "error.h"

+#include "unistd-safer.h"

 
 #include "gettext.h"
 #define _(Msgid)  gettext (Msgid)
 
 
 #include "gettext.h"
 #define _(Msgid)  gettext (Msgid)
 

+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if ! defined __GNUC__ || __GNUC__ < 2 || \
+(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#  define __attribute__(Spec) /* empty */
+# endif
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif
+

 
 /* Initialize this module.  */
 
 
 /* Initialize this module.  */
 


@@ -99,21 +106,14 @@ pid_t
 create_subpipe (char const * const *argv, int fd[2])
 {
   int pipe_fd[2];
 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;
 
   pid_t pid;
 

-  if (pipe (pipe_fd) != 0)
+  if (pipe_safer (child_fd) != 0 || pipe_safer (pipe_fd) != 0)

     error (EXIT_FAILURE, errno, "pipe");
     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];
+  fd[0] = child_fd[1];
+  fd[1] = pipe_fd[0];
+  child_fd[1] = pipe_fd[1];

 
   pid = vfork ();
   if (pid < 0)
 
   pid = vfork ();
   if (pid < 0)


@@ -122,33 +122,24 @@ create_subpipe (char const * const *argv, int fd[2])
   if (! pid)
     {
       /* Child.  */
   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);
 
       /* 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.  */
       _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;
 }
 
   return pid;
 }
 


@@ -178,3 +169,9 @@ reap_subpipe (pid_t pid, char const *program)
     }
 #endif
 }
     }
 #endif
 }

+
+void
+end_of_output_subpipe (pid_t pid ATTRIBUTE_UNUSED,
+                      int fd[2] ATTRIBUTE_UNUSED)
+{
+}