From 7ed1a08985ee943646612563e1fc09f5d51425f8 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 21 Apr 2002 23:57:24 +0000 Subject: Update GNU make to use Autoconf 2.53, Automake 1.6.1, Gettext 0.11.1. We're using Gettext's "external" feature to avoid including the intl code in the GNU make distribution. --- signame.c | 133 ++++++++++++++++++-------------------------------------------- 1 file changed, 39 insertions(+), 94 deletions(-) (limited to 'signame.c') diff --git a/signame.c b/signame.c index 7d12f88..f7128df 100644 --- a/signame.c +++ b/signame.c @@ -1,26 +1,33 @@ /* Convert between signal names and numbers. - Copyright (C) 1990,92,93,95,96,99 Free Software Foundation, Inc. - This file is part of the GNU C Library. +Copyright (C) 1990,92,93,95,96,99, 2002 Free Software Foundation, Inc. +This file was part of the GNU C Library, but is now part of GNU make. - 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. +GNU Make is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, 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. +GNU Make 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 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ +You should have received a copy of the GNU General Public License +along with GNU Make; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ - -/* In the GNU make version, all the headers we need are provided by make.h. */ #include "make.h" +/* If the system provides strsignal, we don't need it. */ + +#if !defined(HAVE_STRSIGNAL) + +/* If the system provides sys_siglist, we'll use that. + Otherwise create our own. + */ + +#if !defined(SYS_SIGLIST_DECLARED) /* Some systems do not define NSIG in . */ #ifndef NSIG @@ -31,27 +38,12 @@ #endif #endif -#if !__STDC__ -#define const -#endif - -#include "signame.h" - -#ifndef HAVE_SYS_SIGLIST /* There is too much variation in Sys V signal numbers and names, so we must initialize them at runtime. */ static const char *undoc; -const char *sys_siglist[NSIG]; - -#else /* HAVE_SYS_SIGLIST. */ - -#ifndef SYS_SIGLIST_DECLARED -extern char *sys_siglist[]; -#endif /* Not SYS_SIGLIST_DECLARED. */ - -#endif /* Not HAVE_SYS_SIGLIST. */ +static const char *sys_siglist[NSIG]; /* Table of abbreviations for signals. Note: A given number can appear more than once with different abbreviations. */ @@ -62,7 +54,9 @@ typedef struct int number; const char *abbrev; } num_abbrev; + static num_abbrev sig_table[SIG_TABLE_SIZE]; + /* Number of elements of sig_table used. */ static int sig_table_nelts = 0; @@ -74,14 +68,13 @@ init_sig (number, abbrev, name) const char *abbrev; const char *name; { -#ifndef HAVE_SYS_SIGLIST /* If this value is ever greater than NSIG it seems like it'd be a bug in the system headers, but... better safe than sorry. We know, for example, that this isn't always true on VMS. */ if (number >= 0 && number < NSIG) sys_siglist[number] = name; -#endif + if (sig_table_nelts < SIG_TABLE_SIZE) { sig_table[sig_table_nelts].number = number; @@ -89,10 +82,9 @@ init_sig (number, abbrev, name) } } -void +static int signame_init () { -#ifndef HAVE_SYS_SIGLIST int i; char *u = _("unknown signal"); @@ -101,7 +93,6 @@ signame_init () /* Initialize signal names. */ for (i = 0; i < NSIG; i++) sys_siglist[i] = undoc; -#endif /* !HAVE_SYS_SIGLIST */ /* Initialize signal names. */ #if defined (SIGHUP) @@ -235,66 +226,12 @@ signame_init () #if defined (SIGNOFP) init_sig (SIGNOFP, "NOFP", _("Floating point co-processor not available")); #endif -} - -/* Return the abbreviation for signal NUMBER. */ - -char * -sig_abbrev (number) - int number; -{ - int i; - if (sig_table_nelts == 0) - signame_init (); - - for (i = 0; i < sig_table_nelts; i++) - if (sig_table[i].number == number) - return (char *)sig_table[i].abbrev; - return NULL; -} - -/* Return the signal number for an ABBREV, or -1 if there is no - signal by that name. */ - -int -sig_number (abbrev) - const char *abbrev; -{ - int i; - - if (sig_table_nelts == 0) - signame_init (); - - /* Skip over "SIG" if present. */ - if (abbrev[0] == 'S' && abbrev[1] == 'I' && abbrev[2] == 'G') - abbrev += 3; - - for (i = 0; i < sig_table_nelts; i++) - if (abbrev[0] == sig_table[i].abbrev[0] - && strcmp (abbrev, sig_table[i].abbrev) == 0) - return sig_table[i].number; - return -1; + return 1; } -#ifndef HAVE_PSIGNAL -/* Print to standard error the name of SIGNAL, preceded by MESSAGE and - a colon, and followed by a newline. */ +#endif /* SYS_SIGLIST_DECLARED */ -void -psignal (signal, message) - int signal; - const char *message; -{ - if (signal <= 0 || signal >= NSIG) - fprintf (stderr, "%s: unknown signal", message); - else - fprintf (stderr, "%s: %s\n", message, sys_siglist[signal]); -} -#endif - -#ifndef HAVE_STRSIGNAL -/* Return the string associated with the signal number. */ char * strsignal (signal) @@ -302,10 +239,18 @@ strsignal (signal) { static char buf[] = "Signal 12345678901234567890"; +#if !defined(SYS_SIGLIST_DECLARED) + static char sig_initted = 0; + + if (!sig_initted) + sig_initted = signame_init (); +#endif + if (signal > 0 || signal < NSIG) return (char *) sys_siglist[signal]; sprintf (buf, "Signal %d", signal); return buf; } -#endif + +#endif /* HAVE_STRSIGNAL */ -- cgit v1.2.3