diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2015-04-30 18:07:48 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2015-04-30 18:07:48 +0000 |
commit | bd620d73642183d518663e472d35332cfee0e928 (patch) | |
tree | b27cb5abab32cc2ea53d70156b69f8f72ae128b2 | |
parent | b709ec868adb5170d09bc5a66b18d0e0d5987ab6 (diff) | |
download | FreeBSD-src-bd620d73642183d518663e472d35332cfee0e928.zip FreeBSD-src-bd620d73642183d518663e472d35332cfee0e928.tar.gz |
MFC r281617:
wc: Fix SIGINFO race causing final results to be lost to stderr.
Relnotes: yes
-rw-r--r-- | usr.bin/wc/wc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 08823a1..156a327 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -74,6 +74,14 @@ siginfo_handler(int sig __unused) siginfo = 1; } +static void +reset_siginfo(void) +{ + + signal(SIGINFO, SIG_DFL); + siginfo = 0; +} + int main(int argc, char *argv[]) { @@ -207,6 +215,7 @@ cnt(const char *file) } else tmpll++; } + reset_siginfo(); tlinect += linect; if (dochar) tcharct += charct; @@ -229,6 +238,7 @@ cnt(const char *file) return (1); } if (S_ISREG(sb.st_mode)) { + reset_siginfo(); charct = sb.st_size; show_cnt(file, linect, wordct, charct, llct); tcharct += charct; @@ -289,6 +299,7 @@ word: gotsp = 1; } } } + reset_siginfo(); if (domulti && MB_CUR_MAX > 1) if (mbrtowc(NULL, NULL, 0, &mbs) == (size_t)-1 && !warned) warn("%s", file != NULL ? file : "stdin"); |