Fix SIGINFO race causing final results to be lost to stderr.
If a SIGINFO comes in after the file is read then the 'siginfo' flag is set to 1 and the next call to show_cnt() (at exit) would print the data to stderr rather than the expected stdout. This was found with spamming Poudriere with SIGINFO which caused a 'wc -l' execution to return no data rather than an expected number. MFC after: 2 weeks
This commit is contained in:
parent
43d4f8c4c6
commit
8ded906d2a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=281617
@ -76,6 +76,14 @@ siginfo_handler(int sig __unused)
|
|||||||
siginfo = 1;
|
siginfo = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
reset_siginfo(void)
|
||||||
|
{
|
||||||
|
|
||||||
|
signal(SIGINFO, SIG_DFL);
|
||||||
|
siginfo = 0;
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
@ -229,6 +237,7 @@ cnt(const char *file)
|
|||||||
} else
|
} else
|
||||||
tmpll++;
|
tmpll++;
|
||||||
}
|
}
|
||||||
|
reset_siginfo();
|
||||||
tlinect += linect;
|
tlinect += linect;
|
||||||
if (dochar)
|
if (dochar)
|
||||||
tcharct += charct;
|
tcharct += charct;
|
||||||
@ -251,6 +260,7 @@ cnt(const char *file)
|
|||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
if (S_ISREG(sb.st_mode)) {
|
if (S_ISREG(sb.st_mode)) {
|
||||||
|
reset_siginfo();
|
||||||
charct = sb.st_size;
|
charct = sb.st_size;
|
||||||
show_cnt(file, linect, wordct, charct, llct);
|
show_cnt(file, linect, wordct, charct, llct);
|
||||||
tcharct += charct;
|
tcharct += charct;
|
||||||
@ -311,6 +321,7 @@ word: gotsp = 1;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
reset_siginfo();
|
||||||
if (domulti && MB_CUR_MAX > 1)
|
if (domulti && MB_CUR_MAX > 1)
|
||||||
if (mbrtowc(NULL, NULL, 0, &mbs) == (size_t)-1 && !warned)
|
if (mbrtowc(NULL, NULL, 0, &mbs) == (size_t)-1 && !warned)
|
||||||
xo_warn("%s", file != NULL ? file : "stdin");
|
xo_warn("%s", file != NULL ? file : "stdin");
|
||||||
|
Loading…
Reference in New Issue
Block a user