diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2026-03-28 08:55:24 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2026-03-28 08:55:24 +0000 |
| commit | c8d40bf8ecc60cc15e3904410db62065ea681fdc (patch) | |
| tree | e8e432a660655d0eb79eeb9becb82eb7ac1fd1b5 /usr.bin/diff | |
| parent | 945e60e018c287f8097f3ee4a30ccf4921845aa1 (diff) | |
Diffstat (limited to 'usr.bin/diff')
| -rw-r--r-- | usr.bin/diff/pr.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index 51cf2c765283..e8a4162d8b18 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -61,7 +61,7 @@ start_pr(char *file1, char *file2) xasprintf(&header, "%s %s %s", diffargs, file1, file2); signal(SIGPIPE, SIG_IGN); fflush(stdout); - if (pipe(pfd) == -1) + if (pipe2(pfd, O_CLOEXEC) == -1) err(2, "pipe"); 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); - if (pfd[0] != STDIN_FILENO) { + if (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), __DECONST(char *, "-h"), header, NULL }; |