Loading...
--- Libc/Libc-1725.40.4/string/FreeBSD/strsignal.c
+++ Libc/Libc-498/string/FreeBSD/strsignal.c
@@ -10,6 +10,10 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,129 +35,40 @@
static char sccsid[] = "@(#)strerror.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strsignal.c,v 1.9 2010/01/24 10:35:26 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/strsignal.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-#include "namespace.h"
-#if defined(NLS)
-#include <nl_types.h>
-#endif
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <signal.h>
-#include "reentrant.h"
-#include "un-namespace.h"
-#define UPREFIX "Unknown signal"
+char *
+strsignal(num)
+ int num;
+{
+#define UPREFIX "Unknown signal: "
+ static char ebuf[40] = UPREFIX; /* 64-bit number + slop */
+ unsigned int signum;
+ char *p, *t;
+ char tmp[40];
-/*
- * Define a buffer size big enough to describe a 64-bit signed integer
- * converted to ASCII decimal (19 bytes), with an optional leading sign
- * (1 byte); delimiter (": ", 2 bytes); and a trailing NUL (1 byte).
- */
-#define TMPSIZE (19 + 1 + 2 + 1)
-#define EBUFSIZE NL_TEXTMAX * sizeof(char)
+ signum = num; /* convert to unsigned */
+ if (signum < sys_nsig)
+ return ((char *)sys_siglist[signum]);
-static once_t sig_init_once = ONCE_INITIALIZER;
-static thread_key_t sig_key;
-static int sig_keycreated = 0;
-
-static void
-sig_keycreate(void)
-{
- sig_keycreated = (thr_keycreate(&sig_key, free) == 0);
-}
-
-static char *
-sig_tlsalloc(void)
-{
- char *ebuf = NULL;
-
- if (thr_once(&sig_init_once, sig_keycreate) != 0 ||
- !sig_keycreated)
- goto thr_err;
- if ((ebuf = thr_getspecific(sig_key)) == NULL) {
- if ((ebuf = malloc(EBUFSIZE)) == NULL)
- goto thr_err;
- if (thr_setspecific(sig_key, ebuf) != 0) {
- free(ebuf);
- ebuf = NULL;
- goto thr_err;
- }
- }
-thr_err:
- return (ebuf);
-}
-
-int
-strsignal_r(int num, char *strsignalbuf, size_t buflen)
-{
- int retval = 0;
- char tmp[TMPSIZE] = { 0 };
- size_t n;
- int signum;
- char *t, *p;
-
- signum = num;
- if (num < 0) {
+ /* Do this by hand, so we don't link to stdio(3). */
+ t = tmp;
+ if (num < 0)
signum = -signum;
- }
-
- t = tmp;
do {
*t++ = "0123456789"[signum % 10];
} while (signum /= 10);
- if (num < 0) {
+ if (num < 0)
*t++ = '-';
+ for (p = ebuf + sizeof(UPREFIX) - 1;;) {
+ *p++ = *--t;
+ if (t <= tmp)
+ break;
}
- int suffixlen = strlen(tmp) + 2;
-
- if (num > 0 && num < NSIG) {
- n = strlcpy(strsignalbuf,
- sys_siglist[num],
- buflen);
- if (n >= (buflen - suffixlen)) {
- retval = ERANGE;
- }
- } else {
- n = strlcpy(strsignalbuf,
- UPREFIX,
- buflen);
- retval = EINVAL;
- }
-
- if (n < (buflen - suffixlen)) {
- p = (strsignalbuf + n);
- *p++ = ':';
- *p++ = ' ';
-
- for (;;) {
- *p++ = *--t;
- if (t <= tmp)
- break;
- }
- *p = '\0';
- }
-
- return retval;
-}
-
-/* XXX: negative 'num' ? (REGR) */
-char *
-strsignal(int num)
-{
- char *ebuf;
-
- ebuf = sig_tlsalloc();
- if (ebuf == NULL) {
- errno = ENOMEM;
- return NULL;
- }
-
- if (strsignal_r(num, ebuf, EBUFSIZE)) {
- errno = EINVAL;
- }
-
+ *p = '\0';
return (ebuf);
}