Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7232:b307709e3a05
* error.c (error_at_line, print_errno_message): Match libc, after
resolution of upstream bug 3044.
author | Eric Blake <ebb9@byu.net> |
---|---|
date | Tue, 29 Aug 2006 16:58:34 +0000 |
parents | 1ec266612c4f |
children | ec85aace506a |
files | lib/ChangeLog lib/error.c |
diffstat | 2 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-08-29 Eric Blake <ebb9@byu.net> + + * error.c (error_at_line, print_errno_message): Match libc, after + resolution of upstream bug 3044. + 2006-08-29 Bruno Haible <bruno@clisp.org> * localcharset.c: Include configmake.h in order to get LIBDIR defined.
--- a/lib/error.c +++ b/lib/error.c @@ -92,23 +92,19 @@ 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 @@ # 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 @@ #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);