emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gcc 7 warnings in pipe routines

Browse Source
This commit is contained in:
William Hubbs 2018-06-19 13:59:16 -05:00
parent 8a945194af
commit 47e4bfae57
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rc/rc-pipes.c
View File

@ -37,21 +37,20 @@ int rc_pipe_command(char *cmd)
return -1; return -1;
pid = fork(); pid = fork();
if (pid < 0) if (pid > 0) {
return -1;
else if (pid > 0) {
/* parent */ /* parent */
close(pfd[0]); close(pfd[pipe_read_end]);
return pfd[pipe_write_end]; return pfd[pipe_write_end];
} else if (pid == 0) { } else if (pid == 0) {
/* child */ /* child */
close(pfd[pipe_write_end]); close(pfd[pipe_write_end]);
if (pfd[0] != STDIN_FILENO) { if (pfd[pipe_read_end] != STDIN_FILENO) {
if (dup2(pfd[0], STDIN_FILENO) < 0) if (dup2(pfd[pipe_read_end], STDIN_FILENO) < 0)
exit(1); exit(1);
close(pfd[0]); close(pfd[pipe_read_end]);
} }
execl("/bin/sh", "sh", "-c", cmd, NULL); execl("/bin/sh", "sh", "-c", cmd, NULL);
exit(1); exit(1);
} }
return -1;
} }