diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-07-06 17:41:52 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-07-06 17:43:11 -0700 |
| commit | b39f5e6c9c50b3153c4e7bfac9219f14da73e4d1 (patch) | |
| tree | 46b8df94b009c3836a28917037b20c7ea31a3119 /src/emacs.c | |
| parent | 851535f58745dcfbc8798b3a34b4fea852f93a3e (diff) | |
| download | emacs-b39f5e6c9c50b3153c4e7bfac9219f14da73e4d1.tar.gz | |
Don’t ignore stderr failure when ADDRESS_SANITIZER
* src/emacs.c (close_output_streams): Move from here ...
* src/sysdep.c: ... to here, where it really belongs anyway.
When ADDRESS_SANITIZER, fflush stderr and check for ferror,
to catch stderr output errors even in this case.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/emacs.c b/src/emacs.c index 32bb57e2725..fc1a4beec50 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -29,8 +29,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #include <sys/stat.h> #include <unistd.h> -#include <close-stream.h> - #define MAIN_PROGRAM #include "lisp.h" #include "sysstdio.h" @@ -661,24 +659,6 @@ argmatch (char **argv, int argc, const char *sstr, const char *lstr, } } -/* Close standard output and standard error, reporting any write - errors as best we can. This is intended for use with atexit. */ -static void -close_output_streams (void) -{ - if (close_stream (stdout) != 0) - { - emacs_perror ("Write error to standard output"); - _exit (EXIT_FAILURE); - } - - /* Do not close stderr if addresses are being sanitized, as the - sanitizer might report to stderr after this function is - invoked. */ - if (!ADDRESS_SANITIZER && close_stream (stderr) != 0) - _exit (EXIT_FAILURE); -} - #ifdef HAVE_PDUMPER static const char * |
