Date: Fri, 1 Sep 2017 22:37:49 +0000 (UTC) From: Conrad Meyer <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323123 - in head/usr.bin/tail: . tests Message-ID: <201709012237.v81Mbnp3049853@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Fri Sep 1 22:37:49 2017 New Revision: 323123 URL: https://svnweb.freebsd.org/changeset/base/323123 Log: tail(1): Do not print bogus errno string In the case where write(2) does not return -1, it does not initialize errno. This can happen when a broken pipe causes a short write. I attempted to adapt the submitted test case to ATF but could not figure out how to make the test run in the ATF environment. So the aborted test is left disabled, in case someone would like to run it manually or fix it. PR: 221976 Submitted by: <martin AT lispworks.com> (earlier version) Sponsored by: Dell EMC Isilon Modified: head/usr.bin/tail/extern.h head/usr.bin/tail/tests/tail_test.sh Modified: head/usr.bin/tail/extern.h ============================================================================== --- head/usr.bin/tail/extern.h Fri Sep 1 22:04:45 2017 (r323122) +++ head/usr.bin/tail/extern.h Fri Sep 1 22:37:49 2017 (r323123) @@ -32,9 +32,15 @@ */ #define WR(p, size) do { \ - if (write(STDOUT_FILENO, p, size) != (ssize_t)size) \ - oerr(); \ - } while(0) + ssize_t res; \ + res = write(STDOUT_FILENO, p, size); \ + if (res != (ssize_t)size) { \ + if (res == -1) \ + oerr(); \ + else \ + errx(1, "stdout"); \ + } \ +} while (0) #define TAILMAPLEN (4<<20) Modified: head/usr.bin/tail/tests/tail_test.sh ============================================================================== --- head/usr.bin/tail/tests/tail_test.sh Fri Sep 1 22:04:45 2017 (r323122) +++ head/usr.bin/tail/tests/tail_test.sh Fri Sep 1 22:37:49 2017 (r323123) @@ -215,7 +215,20 @@ longfile_rn2500_body() atf_check cmp expectfile outpipe } +atf_test_case broken_pipe +broken_pipe_head() +{ + atf_set "descr" "Do not print bogus errno based output on short writes" +} +broken_pipe_body() +{ + atf_expect_fail "Can't seem to get testcase to work in test environment. Reproduces easily in interactive shell." + seq -f '%128g' 1 1000 > ints + atf_check -s exit:1 -o ignore -e "inline:tail: stdout" tail -n 856 ints | awk '{ exit }' +} + + atf_init_test_cases() { atf_add_test_case empty_r @@ -230,4 +243,5 @@ atf_init_test_cases() atf_add_test_case longfile_rc135782 atf_add_test_case longfile_rc145782_longlines atf_add_test_case longfile_rn2500 + #atf_add_test_case broken_pipe }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709012237.v81Mbnp3049853>