From 1a420a876d6d35ceb3e1530dc495622a1a845591 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 14 Aug 2006 16:08:25 +0000 Subject: [PATCH] * misc/error.c: Add space between program name and message if file name is missing. --- lib/ChangeLog | 10 ++++++++++ lib/error.c | 9 ++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 7131ebc52..05131b0b7 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,13 @@ +2006-08-14 Eric Blake + + Import the following change from libc: + + 2006-08-12 Ulrich Drepper + + Upstream bug 2997. + * misc/error.c: Add space between program name and message if file + name is missing. + 2006-08-11 Paul Eggert * pipe-safer.c (pipe_safer): Fix misspelling: HAVE_FUNC_PIPE -> diff --git a/lib/error.c b/lib/error.c index 34e836552..d8814e07e 100644 --- a/lib/error.c +++ b/lib/error.c @@ -310,14 +310,13 @@ error_at_line (int status, int errnum, const char *file_name, #endif } - if (file_name != NULL) - { #if _LIBC - __fxprintf (NULL, "%s:%d: ", file_name, line_number); + __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ", + file_name, line_number); #else - fprintf (stderr, "%s:%d: ", file_name, line_number); + fprintf (stderr, file_name != NULL ? "%s:%d: " : " ", + file_name, line_number); #endif - } va_start (args, message); error_tail (status, errnum, message, args); -- 2.11.0