diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-12-02 19:30:06 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-12-02 19:30:06 +0000 |
| commit | cf08959f7cb4e48515f5190c2ab6db9d6263c6ba (patch) | |
| tree | 0195389d1d746d686b476e785d4c76302deca1b2 | |
| parent | 6065004c08a7938ce87e9f1f7e53465f644c4cd5 (diff) | |
Fix signal races for isatty(3) (calls ioctl(2)) and printf(3);
save/restore errno. YY_FLUSH_BUFFER might still be a problem.
Spotted by and ok deraadt@
| -rw-r--r-- | usr.bin/bc/scan.l | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usr.bin/bc/scan.l b/usr.bin/bc/scan.l index 31058afb41f..3448cd8813e 100644 --- a/usr.bin/bc/scan.l +++ b/usr.bin/bc/scan.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: scan.l,v 1.15 2004/10/19 07:36:51 otto Exp $ */ +/* $OpenBSD: scan.l,v 1.16 2004/12/02 19:30:05 otto Exp $ */ /* * Copyright (c) 2003, Otto Moerbeek <otto@drijf.net> @@ -18,10 +18,11 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: scan.l,v 1.15 2004/10/19 07:36:51 otto Exp $"; +static const char rcsid[] = "$OpenBSD: scan.l,v 1.16 2004/12/02 19:30:05 otto Exp $"; #endif /* not lint */ #include <err.h> +#include <signal.h> #include <stdbool.h> #include <string.h> @@ -34,6 +35,7 @@ int lineno; static char *strbuf = NULL; static size_t strbuf_sz = 1; static bool dot_seen; +static volatile sig_atomic_t interactive = 0; static void init_strbuf(void); static void add_str(const char *); @@ -223,9 +225,14 @@ add_str(const char *str) void abort_line(int sig) { - if (isatty(fileno(yyin))) { + const char str[] = "[\n]P\n"; + int save_errno; + + if (interactive) { + save_errno = errno; YY_FLUSH_BUFFER; - printf("[\n]P\n"); + write(STDOUT_FILENO, str, sizeof(str) - 1); + errno = save_errno; } } @@ -264,6 +271,7 @@ yywrap(void) } else if (fileindex == sargc) { fileindex++; yyin = stdin; + interactive = isatty(fileno(yyin)); lineno = 1; filename = "stdin"; return (0); |