aboutsummaryrefslogtreecommitdiff
path: root/misc/error.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-21 10:01:05 +0000
committerRoland McGrath <roland@gnu.org>1996-01-21 10:01:05 +0000
commitbbed653cda6007426e8291a5d32963552cc4f417 (patch)
tree881a95cad53014826d7906027926e00bc45dbca3 /misc/error.c
parenteb63bdd072eafe6aba40d254a71fd87285f497da (diff)
downloadglibc-bbed653cda6007426e8291a5d32963552cc4f417.tar
glibc-bbed653cda6007426e8291a5d32963552cc4f417.tar.gz
glibc-bbed653cda6007426e8291a5d32963552cc4f417.tar.bz2
glibc-bbed653cda6007426e8291a5d32963552cc4f417.zip
Sun Jan 21 00:55:25 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>cvs/libc-960121
* sysdeps/unix/sysv/linux/shmat.c: Include sys/shm.h instead of sys/sem.h. * stdlib/stdlib.h [__USE_SVID]: Declare a64l, l64a. * stdlib/l64a.c: Use 6-bit numbers as indices in CONV_TABLE, not literal byte values. * misc/bsd-compat.c (getpgrp): Define with prototype. * misc/init-misc.c (__progname_full): New variable. (program_invocation_name, program_invocation_short_name): New aliases. (__init_misc): Define with prototype. Set __progname_full. * misc/progname.c: File removed. * misc/Makefile (aux): Remove progname. * misc/hsearch_r.c (isprime): Define with prototype. * sysdeps/unix/sysv/linux/seteuid.c: Just include unix/bsd version. * sysdeps/unix/bsd/seteuid.c: Disallow arg of -1. * sysdeps/unix/bsd/setegid.c: Likewise.
Diffstat (limited to 'misc/error.c')
-rw-r--r--misc/error.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/misc/error.c b/misc/error.c
index da3c6ee1b2..cdba470656 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -1,5 +1,5 @@
/* error.c -- error handler for noninteractive utilities
- Copyright (C) 1990, 91, 92, 93, 94, 95 Free Software Foundation, Inc.
+ Copyright (C) 1990, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
@@ -47,23 +47,27 @@ Cambridge, MA 02139, USA. */
void exit ();
#endif
-/* This variable is incremented each time `error' is called. */
-unsigned int error_message_count;
-
/* If NULL, error will flush stdout, then print on stderr the program
name, a colon and a space. Otherwise, error will call this
function without parameters instead. */
-void (*error_print_progname) () = NULL;
+void (*error_print_progname) ();
+
+/* This variable is incremented each time `error' is called. */
+unsigned int error_message_count;
#ifdef _LIBC
+/* In the GNU C library, there is a predefined variable for this. */
+
#define program_name program_invocation_name
-#endif
+#include <errno.h>
+
+#else
/* The calling program should define program_name and set it to the
name of the executing program. */
extern char *program_name;
-#if HAVE_STRERROR || _LIBC
+#if HAVE_STRERROR
# ifndef strerror /* On some systems, strerror is a macro */
char *strerror ();
# endif
@@ -80,7 +84,8 @@ private_strerror (errnum)
return "Unknown system error";
}
#define strerror private_strerror
-#endif
+#endif /* HAVE_STRERROR */
+#endif /* _LIBC */
/* Print the program name and error message MESSAGE, which is a printf-style
format string with optional args.