From 26bb2bf67a7c3b23602c6ccfc0f010a4115ef0e8 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 29 Aug 2006 16:58:34 +0000 Subject: [PATCH] * error.c (error_at_line, print_errno_message): Match libc, after resolution of upstream bug 3044. --- lib/ChangeLog | 5 +++++ lib/error.c | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index e7a76e9c32..d11d6b8f43 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-08-29 Eric Blake + + * error.c (error_at_line, print_errno_message): Match libc, after + resolution of upstream bug 3044. + 2006-08-29 Bruno Haible * localcharset.c: Include configmake.h in order to get LIBDIR defined. diff --git a/lib/error.c b/lib/error.c index d8814e07ec..e6e680743c 100644 --- a/lib/error.c +++ b/lib/error.c @@ -92,23 +92,19 @@ extern void __error_at_line (int status, int errnum, const char *file_name, char *strerror_r (); # endif -# ifndef SIZE_MAX -# define SIZE_MAX ((size_t) -1) -# endif - /* The calling program should define program_name and set it to the name of the executing program. */ extern char *program_name; # if HAVE_STRERROR_R || defined strerror_r # define __strerror_r strerror_r -# endif +# endif /* HAVE_STRERROR_R || defined strerror_r */ #endif /* not _LIBC */ static void print_errno_message (int errnum) { - char const *s = NULL; + char const *s; #if defined HAVE_STRERROR_R || _LIBC char errbuf[1024]; @@ -117,11 +113,15 @@ print_errno_message (int errnum) # else if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0) s = errbuf; + else + s = 0; # endif +#else + s = strerror (errnum); #endif #if !_LIBC - if (! s && ! (s = strerror (errnum))) + if (! s) s = _("Unknown system error"); #endif @@ -312,10 +312,10 @@ error_at_line (int status, int errnum, const char *file_name, #if _LIBC __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ", - file_name, line_number); + file_name, line_number); #else fprintf (stderr, file_name != NULL ? "%s:%d: " : " ", - file_name, line_number); + file_name, line_number); #endif va_start (args, message); -- 2.30.2