KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

diff: use O_CLOEXEC on pipes

Browse Source 
This only simplifies the code, no functional changes expected

MFC After:	1 week
This commit is contained in:
Baptiste Daroussin
2026-03-28 09:55:24 +01:00
parent 945e60e018
commit c8d40bf8ec
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr.bin/diff/pr.c
+2 -5
View File
@@ -61,7 +61,7 @@ start_pr(char *file1, char *file2)
xasprintf(&header, "%s %s %s", diffargs, file1, file2); xasprintf(&header, "%s %s %s", diffargs, file1, file2);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
fflush(stdout); fflush(stdout);
if (pipe(pfd) == -1) if (pipe2(pfd, O_CLOEXEC) == -1)
err(2, "pipe"); err(2, "pipe");
if ((error = posix_spawnattr_init(&sa)) != 0) if ((error = posix_spawnattr_init(&sa)) != 0)
@@ -71,11 +71,8 @@ start_pr(char *file1, char *file2)
posix_spawnattr_setprocdescp_np(&sa, &pr->procd, 0); posix_spawnattr_setprocdescp_np(&sa, &pr->procd, 0);
if (pfd[0] != STDIN_FILENO) { if (pfd[0] != STDIN_FILENO)
posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO); posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO);
posix_spawn_file_actions_addclose(&fa, pfd[0]);
}
posix_spawn_file_actions_addclose(&fa, pfd[1]);
char *argv[] = { __DECONST(char *, _PATH_PR), char *argv[] = { __DECONST(char *, _PATH_PR),
__DECONST(char *, "-h"), header, NULL }; __DECONST(char *, "-h"), header, NULL };