diff --git a/NEWS b/NEWS index 85fd5be12..faac5c543 100644 --- a/NEWS +++ b/NEWS @@ -117,6 +117,8 @@ GNU coreutils NEWS -*- outline -*- sort --debug now diagnoses issues with --field-separator characters that conflict with characters possibly used in numbers. + 'tail -f file | filter' now exits on Solaris when filter exits. + root invoked coreutils, that are built and run in single binary mode, now adjust /proc/$pid/cmdline to be more specific to the utility being run, rather than using the general "coreutils" binary name. diff --git a/src/tail.c b/src/tail.c index f1b741783..a4a590a79 100644 --- a/src/tail.c +++ b/src/tail.c @@ -55,7 +55,7 @@ # include #endif -#if defined _AIX || HAVE_INOTIFY +#if defined _AIX || defined __sun || HAVE_INOTIFY # include #endif @@ -356,12 +356,12 @@ check_output_alive (void) event immediately) or if using inotify (which relies on 'poll' anyway). Otherwise, use 'select' as it's more portable; 'poll' doesn't work for this application on macOS. */ -#if defined _AIX || HAVE_INOTIFY +#if defined _AIX || defined __sun || HAVE_INOTIFY struct pollfd pfd; pfd.fd = STDOUT_FILENO; - pfd.events = POLLERR; + pfd.events = pfd.revents = 0; - if (poll (&pfd, 1, 0) >= 0 && (pfd.revents & POLLERR)) + if (poll (&pfd, 1, 0) >= 0 && (pfd.revents & (POLLERR | POLLHUP))) die_pipe (); #else struct timeval delay; diff --git a/tests/tail-2/pipe-f.sh b/tests/tail-2/pipe-f.sh index 97d5bce69..4ca43a3ea 100755 --- a/tests/tail-2/pipe-f.sh +++ b/tests/tail-2/pipe-f.sh @@ -17,7 +17,7 @@ # along with this program. If not, see . . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -print_ver_ tail test +print_ver_ tail test head trap_sigpipe_or_skip_ # Speedup the non inotify case @@ -45,7 +45,7 @@ for disposition in '' '-'; do (trap "$disposition" PIPE; returns_ 124 timeout 10 \ tail -n2 -f $mode $fastpoll out && touch timed_out) | - sed 2q > out2 + head -n2 > out2 test -e timed_out && fail=1 compare exp out2 || fail=1 rm -f timed_out