diff options
| -rw-r--r-- | src/split.c | 6 | ||||
| -rwxr-xr-x | tests/split/filter | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/split.c b/src/split.c index 6c75080a7..3f925380e 100644 --- a/src/split.c +++ b/src/split.c @@ -1230,15 +1230,15 @@ main (int argc, char **argv) /* When filtering, closure of one pipe must not terminate the process, as there may still be other streams expecting input from us. */ - sigemptyset (&newblocked); if (filter_command) { struct sigaction act; + sigemptyset (&newblocked); sigaction (SIGPIPE, NULL, &act); if (act.sa_handler != SIG_IGN) sigaddset (&newblocked, SIGPIPE); + sigprocmask (SIG_BLOCK, &newblocked, &oldblocked); } - sigprocmask (SIG_BLOCK, &newblocked, &oldblocked); switch (split_type) { @@ -1276,8 +1276,6 @@ main (int argc, char **argv) abort (); } - sigprocmask (SIG_SETMASK, &oldblocked, NULL); - if (close (STDIN_FILENO) != 0) error (EXIT_FAILURE, errno, "%s", infile); closeout (NULL, output_desc, filter_pid, outfile); diff --git a/tests/split/filter b/tests/split/filter index 4c25c5fcd..0614841ed 100755 --- a/tests/split/filter +++ b/tests/split/filter @@ -43,4 +43,8 @@ done split -e -n 10 --filter='xz > $FILE.xz' /dev/null || fail=1 stat x?? 2>/dev/null && fail=1 +# Ensure SIGPIPEs sent by the children don't propagate back +# where they would result in a non zero exit from split. +yes | head -n200K | split -b1G --filter='head -c1 >/dev/null' || fail=1 + Exit $fail |