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 4eee4a0f98f005734f1056c262e93e97a167bf13..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, 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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


@@ -71,6 +67,18 @@
 #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.  */
 


@@ -101,19 +109,15 @@ create_subpipe (char const * const *argv, int fd[2])
   int child_fd[2];
   pid_t pid;
 
   int child_fd[2];
   pid_t pid;
 

-  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");
+  if (pipe_safer (child_fd) != 0 || pipe_safer (pipe_fd) != 0)
+    error (EXIT_FAILURE, errno, "pipe");
+  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)

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

 
   if (! pid)
     {
 
   if (! pid)
     {


@@ -148,8 +152,7 @@ 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;


@@ -168,6 +171,7 @@ reap_subpipe (pid_t pid, char const *program)
 }
 
 void
 }
 
 void

-end_of_output_subpipe (pid_t pid, int fd[2])
+end_of_output_subpipe (pid_t pid ATTRIBUTE_UNUSED,
+                      int fd[2] ATTRIBUTE_UNUSED)

 {
 }
 {
 }