From cefc0d927f11f9749c082d58d65c3e9ac007e8a1 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 7 Dec 2007 11:34:47 +0000 Subject: 24179: use queue_signals() for 24170 24180: back off strerror_r() patch, except for use of temporary var --- Src/utils.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'Src/utils.c') diff --git a/Src/utils.c b/Src/utils.c index 7c22a277f..d776d7cb3 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -310,34 +310,7 @@ zerrmsg(FILE *file, const char *fmt, va_list ap) errflag = 1; return; } -#ifdef HAVE_STRERROR_R - /* - * There are two incompatible strerror_r()s floating round. - * The GNU extension refuses to copy the message into the - * buffer if it can return a constant string. To suppress it - * we need to define _XOPEN_SOURCE to 600. I don't dare do - * this because we're already depending on _GNU_SOURCE. So - * try to handle both by looking for errno being set (for the - * standard version failing) or errbuf being left untouched - * (for the GNU version). One presumes that if strerror_r() - * didn't copy anything to errbuf, then it's safe to - * call strerror() to get the string. - * - * This is a mess, but it's about a decade and half - * too late to shirk from messes in the source. - */ - olderrno = errno; - errno = 0; - errbuf[0] = '\0'; - strerror_r(num, errbuf, ERRBUFSIZE); - if (errno || errbuf[0] == '\0') - errmsg = strerror(num); - else - errmsg = errbuf; - errno = olderrno; -#else errmsg = strerror(num); -#endif /* If the message is not about I/O problems, it looks better * * if we uncapitalize the first letter of the message */ if (num == EIO) -- cgit v1.2.3