* misc/error.c: Add space between program name and message if file

name is missing.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7131ebc528bd2c0ad7e4722a57b4d9ee07188eaa..05131b0b7883f946889d73d72b319307369541eb 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-14  Eric Blake  <ebb9@byu.net>
+
+       Import the following change from libc:
+
+       2006-08-12  Ulrich Drepper  <drepper@redhat.com>
+
+       Upstream bug 2997.
+       * misc/error.c: Add space between program name and message if file
+       name is missing.
+
 2006-08-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        * pipe-safer.c (pipe_safer): Fix misspelling: HAVE_FUNC_PIPE ->

diff --git a/lib/error.c b/lib/error.c
index 34e83655291a39bead88115a9f1b0c98b3b37b1d..d8814e07ec0ea95545bba1d22b971ea4a374a3be 100644 (file)
--- 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);