Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* lib/subpipe.c (create_subpipe): Use new gnulib pipe_safer

Browse Source 
function, since it simplifies our code a bit.
This commit is contained in:
Paul Eggert
2006-08-11 20:30:38 +00:00
parent 34ec357927
commit b4c2a79743
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/subpipe.c
View File

@@ -113,19 +113,15 @@ create_subpipe (char const * const *argv, int fd[2])
int child_fd[2]; int child_fd[2];
pid_t pid; pid_t pid;
if (pipe (child_fd) != 0 if (pipe_safer (child_fd) != 0 || pipe_safer (pipe_fd) != 0)
|| (child_fd[0] = fd_safer (child_fd[0])) < 0 error (EXIT_FAILURE, errno, "pipe");
|| (fd[0] = fd_safer (child_fd[1])) < 0 fd[0] = child_fd[1];
|| pipe (pipe_fd) != 0 fd[1] = pipe_fd[0];
|| (fd[1] = fd_safer (pipe_fd[0])) < 0 child_fd[1] = pipe_fd[1];
|| (child_fd[1] = fd_safer (pipe_fd[1])) < 0)
error (EXIT_FAILURE, errno,
"pipe");
pid = vfork (); pid = vfork ();
if (pid < 0) if (pid < 0)
error (EXIT_FAILURE, errno, error (EXIT_FAILURE, errno, "fork");
"fork");
if (! pid) if (! pid)
{ {
@@ -160,8 +156,7 @@ reap_subpipe (pid_t pid, char const *program)
#if HAVE_WAITPID || defined waitpid #if HAVE_WAITPID || defined waitpid
int wstatus; int wstatus;
if (waitpid (pid, &wstatus, 0) < 0) if (waitpid (pid, &wstatus, 0) < 0)
error (EXIT_FAILURE, errno, error (EXIT_FAILURE, errno, "waitpid");
"waitpid");
else else
{ {
int status = WIFEXITED (wstatus) ? WEXITSTATUS (wstatus) : -1; int status = WIFEXITED (wstatus) ? WEXITSTATUS (wstatus) : -1;