diff options
| author |  Ton Voon <tonvoon@users.sourceforge.net>
| 2006-05-18 22:05:43 +0000 |
|---|---|---|
| committer | Ton Voon <tonvoon@users.sourceforge.net>
| 2006-05-18 22:05:43 +0000 |
| commit | a8cd7705e7898d77764aa12ddcc2e29de1860138 (patch) | |
| tree | 970f609cbecbe515998907fd55a12f814ad2edcd /lib/error.c | |
| parent | 08394ddb2d62ec8aab9121e45ab9c1a102e85ba4 (diff) | |
| download | monitoring-plugins-a8cd7705e7898d77764aa12ddcc2e29de1860138.tar.gz | |
Synchronise with coreutils 2.95. Gettext now synced with coreutils,
so no longer development platform requirement
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1394 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'lib/error.c')
| -rw-r--r-- | lib/error.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/error.c b/lib/error.c index 1149235a..45698be8 100644 --- a/lib/error.c +++ b/lib/error.c @@ -1,5 +1,5 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ @@ -29,9 +29,7 @@ #include <stdlib.h> #include <string.h> -#ifdef _LIBC -# include <libintl.h> -#else +#if !_LIBC && ENABLE_NLS # include "gettext.h" #endif @@ -40,7 +38,7 @@ # define mbsrtowcs __mbsrtowcs #endif -#if !_LIBC +#if USE_UNLOCKED_IO # include "unlocked-io.h" #endif @@ -106,7 +104,7 @@ extern char *program_name; static void print_errno_message (int errnum) { - char const *s; + char const *s = NULL; #if defined HAVE_STRERROR_R || _LIBC char errbuf[1024]; @@ -115,15 +113,11 @@ 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) + if (! s && ! (s = strerror (errnum))) s = _("Unknown system error"); #endif |