+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 ->
#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);