|
@@ -1,10 +1,27 @@
|
|
-#include <stdio.h>
|
|
|
|
|
|
+#include "stdio_impl.h"
|
|
#include <string.h>
|
|
#include <string.h>
|
|
#include <signal.h>
|
|
#include <signal.h>
|
|
|
|
+#include <errno.h>
|
|
|
|
|
|
void psignal(int sig, const char *msg)
|
|
void psignal(int sig, const char *msg)
|
|
{
|
|
{
|
|
|
|
+ FILE *f = stderr;
|
|
char *s = strsignal(sig);
|
|
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);
|
|
}
|
|
}
|