util.c: output function might override errno and thus affect perror()

Original patch by Raymond Cole with some modifications, thanks!
This commit is contained in:
Hiltjo Posthuma 2024-10-27 20:10:07 +01:00
parent 8933ebcf50
commit fcb2476b69
1 changed files with 7 additions and 6 deletions

11
util.c
View File

@ -1,4 +1,5 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -10,17 +11,17 @@ void
die(const char *fmt, ...) die(const char *fmt, ...)
{ {
va_list ap; va_list ap;
int saved_errno;
saved_errno = errno;
va_start(ap, fmt); va_start(ap, fmt);
vfprintf(stderr, fmt, ap); vfprintf(stderr, fmt, ap);
va_end(ap); va_end(ap);
if (fmt[0] && fmt[strlen(fmt)-1] == ':') { if (fmt[0] && fmt[strlen(fmt)-1] == ':')
fputc(' ', stderr); fprintf(stderr, " %s", strerror(saved_errno));
perror(NULL);
} else {
fputc('\n', stderr); fputc('\n', stderr);
}
exit(1); exit(1);
} }