diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/err.c | 30 | ||||
| -rw-r--r-- | misc/error.c | 32 | ||||
| -rw-r--r-- | misc/ttyslot.c | 14 |
3 files changed, 50 insertions, 26 deletions
diff --git a/misc/err.c b/misc/err.c index 3ad7bf360f..d527573c89 100644 --- a/misc/err.c +++ b/misc/err.c @@ -1,21 +1,21 @@ /* err.c --- 4.4BSD utility functions for error messages. -Copyright (C) 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <stdarg.h> #include <err.h> @@ -56,7 +56,7 @@ vwarn (const char *format, __gnuc_va_list ap) vfprintf (stderr, format, ap); fputs (": ", stderr); } - fprintf (stderr, "%s\n", strerror (error)); + fprintf (stderr, "%m\n"); } diff --git a/misc/error.c b/misc/error.c index 3d2777bc2c..308c601f22 100644 --- a/misc/error.c +++ b/misc/error.c @@ -77,11 +77,12 @@ unsigned int error_message_count; name of the executing program. */ extern char *program_name; -#if HAVE_STRERROR -# ifndef strerror /* On some systems, strerror is a macro */ +#ifndef HAVE_STRERROR_R +# if HAVE_STRERROR +# ifndef strerror /* On some systems, strerror is a macro */ char *strerror (); -# endif -#else +# endif +# else static char * private_strerror (errnum) int errnum; @@ -93,8 +94,9 @@ private_strerror (errnum) return _(sys_errlist[errnum]); return _("Unknown system error"); } -#define strerror private_strerror -#endif /* HAVE_STRERROR */ +# define strerror private_strerror +# endif /* HAVE_STRERROR */ +#endif /* HAVE_STRERROR_R */ #endif /* _LIBC */ /* Print the program name and error message MESSAGE, which is a printf-style @@ -140,7 +142,14 @@ error (status, errnum, message, va_alist) ++error_message_count; if (errnum) - fprintf (stderr, ": %s", strerror (errnum)); + { +#if defined HAVE_STRERROR_R || defined _LIBC + char errbuf[1024]; + fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf)); +#else + fprintf (stderr, ": %s", strerror (errnum)); +#endif + } putc ('\n', stderr); fflush (stderr); if (status) @@ -208,7 +217,14 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist) ++error_message_count; if (errnum) - fprintf (stderr, ": %s", strerror (errnum)); + { +#if defined HAVE_STRERROR_R || defined _LIBC + char errbuf[1024]; + fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf)); +#else + fprintf (stderr, ": %s", strerror (errnum)); +#endif + } putc ('\n', stderr); fflush (stderr); if (status) diff --git a/misc/ttyslot.c b/misc/ttyslot.c index 3d9fee62fc..794cada0af 100644 --- a/misc/ttyslot.c +++ b/misc/ttyslot.c @@ -36,6 +36,7 @@ static char sccsid[] = "@(#)ttyslot.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <ttyent.h> +#include <alloca.h> #include <stdio.h> #include <string.h> #include <unistd.h> @@ -47,12 +48,19 @@ ttyslot() register int slot; register char *p; int cnt; + size_t buflen = __sysconf (_SC_TTY_NAME_MAX) + 1; char *name; + if (buflen == 0) + /* This should be enough if no fixed value is given. */ + buflen = 32; + + name = __alloca (buflen); + setttyent(); - for (cnt = 0; cnt < 3; ++cnt) - if (name = ttyname(cnt)) { - if (p = rindex(name, '/')) + for (cnt = 0; cnt < 3; ++cnt) + if (__ttyname_r (cnt, name, buflen) >= 0) { + if (p = rindex(name, '/')) ++p; else p = name; |