RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-02-24 06:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent psignal/psiginfo from clobbering stderr orientation, errno

Browse Source 
these functions are specified to write to stderr but not set its
orientation, presumably so that they can be used in programs operating
stderr in wide mode. also, they are not allowed to clobber errno on
success. save and restore to meet the requirement.

psiginfo is reduced to a think wrapper around psignal, since it
already behaved the same. if we want to add more detailed siginfo
printing at some point this will need refactoring.
This commit is contained in:
Rich Felker 2018-08-30 00:00:22 -04:00
parent a43a7b215c
commit cd8d830997
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/signal/psiginfo.c
View File

@ -1,10 +1,6 @@
#include <stdio.h>
#include <string.h>
#include <signal.h>
void psiginfo(const siginfo_t *si, const char *msg)
{
char *s = strsignal(si->si_signo);
if (msg) fprintf(stderr, "%s: %s\n", msg, s);
else fprintf(stderr, "%s\n", s);
psignal(si->si_signo, msg);
}

23
src/signal/psignal.c
View File

@ -1,10 +1,27 @@
#include <stdio.h>
#include "stdio_impl.h"
#include <string.h>
#include <signal.h>
#include <errno.h>
void psignal(int sig, const char *msg)
{
FILE *f = stderr;
char *s = strsignal(sig);
if (msg) fprintf(stderr, "%s: %s\n", msg, s);
else fprintf(stderr, "%s\n", s);
FLOCK(f);
/* Save stderr's orientation and encoding rule, since psignal is not
* permitted to change them. Save errno and restore it if there is no
* error since fprintf might change it even on success but psignal is
* not permitted to do so. */
void *old_locale = f->locale;
int old_mode = f->mode;
int old_errno = errno;
if (fprintf(f, "%s%s%s\n", msg?msg:"", msg?": ":"", s)>=0)
errno = old_errno;
f->mode = old_mode;
f->locale = old_locale;
FUNLOCK(f);
}