(b4_c_modern): Parenthesize.

[bison.git] / lib / subpipe.c

diff --git a/lib/subpipe.c b/lib/subpipe.c
index cfc94262c9b1b0672a9e622d92793822c45ffb66..4eee4a0f98f005734f1056c262e93e97a167bf13 100644 (file)
--- a/lib/subpipe.c
+++ b/lib/subpipe.c
@@ -44,9 +44,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
 


@@ -100,40 +98,32 @@ 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
-      || (to_in_fd = fd_safer (pipe_fd[0])) < 0
-      || (to_out_fd = fd_safer (pipe_fd[1])) < 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
       || pipe (pipe_fd) != 0

-      || (from_in_fd = fd_safer (pipe_fd[0])) < 0
-      || (from_out_fd = fd_safer (pipe_fd[1])) < 0)
-    error (EXIT_FAILURE, errno, "pipe");
-
-  /* Save the local variables in the parent now, in case vfork
-     clobbers them.  */
-  fd[0] = to_out_fd;
-  fd[1] = from_in_fd;
-  pipe_fd[0] = to_in_fd;
-  pipe_fd[1] = from_out_fd;
+      || (fd[1] = fd_safer (pipe_fd[0])) < 0
+      || (child_fd[1] = fd_safer (pipe_fd[1])) < 0)
+    error (EXIT_FAILURE, errno,
+          "pipe");

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

-    error (EXIT_FAILURE, errno, "fork");
+    error (EXIT_FAILURE, errno,
+          "fork");

 
   if (! pid)
     {
       /* Child.  */
 
   if (! pid)
     {
       /* Child.  */

-      close (to_out_fd);
-      close (from_in_fd);
-      dup2 (to_in_fd, STDIN_FILENO);
-      close (to_in_fd);
-      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
 
       /* The cast to (char **) rather than (char * const *) is needed
         for portability to older hosts with a nonstandard prototype


@@ -144,8 +134,8 @@ create_subpipe (char const * const *argv, int fd[2])
     }
 
   /* Parent.  */
     }
 
   /* Parent.  */

-  close (pipe_fd[0]);
-  close (pipe_fd[1]);
+  close (child_fd[0]);
+  close (child_fd[1]);

   return pid;
 }
 
   return pid;
 }
 


@@ -158,7 +148,8 @@ reap_subpipe (pid_t pid, char const *program)
 #if HAVE_WAITPID || defined waitpid
   int wstatus;
   if (waitpid (pid, &wstatus, 0) < 0)
 #if HAVE_WAITPID || defined waitpid
   int wstatus;
   if (waitpid (pid, &wstatus, 0) < 0)

-    error (EXIT_FAILURE, errno, "waitpid");
+    error (EXIT_FAILURE, errno,
+          "waitpid");

   else
     {
       int status = WIFEXITED (wstatus) ? WEXITSTATUS (wstatus) : -1;
   else
     {
       int status = WIFEXITED (wstatus) ? WEXITSTATUS (wstatus) : -1;


@@ -175,3 +166,8 @@ reap_subpipe (pid_t pid, char const *program)
     }
 #endif
 }
     }
 #endif
 }

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