New locale support (in development). Supports LC_CTYPE, LC_NUMERIC,

[uclinux-h8/uClibc.git] / libc / string / strsignal.c

diff --git a/libc/string/strsignal.c b/libc/string/strsignal.c
index e482512..0445940 100644 (file)
--- a/libc/string/strsignal.c
+++ b/libc/string/strsignal.c
@@ -1,7 +1,21 @@
 /* vi: set sw=4 ts=4: */
-/* Copyright (C) 2000 Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- * This file is part of the uClinux and is distributed under the 
- * GNU Library General Public License.
+/* strsignal for uClibc
+ *
+ * Copyright (C) 2000,2001 by Erik Andersen <andersen@uclibc.org>
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 /*
@@ -20,22 +34,23 @@
  *
  * Added the option WANT_SIGLIST for low-memory applications to omit the
  * signal message strings and only output the signal number.
+ *
+ * Manuel Novoa III       Feb 2002
+ *
+ * Change to use _int10tostr and fix a bug in end-of-buf arg.
  */
 
 #define WANT_SIGLIST       1
+
+#define _STDIO_UTILITY                 /* For _int10tostr. */
+#include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
 #include <signal.h>
-#include <limits.h>
+#ifndef __USE_GNU
 #define __USE_GNU
-#include <string.h>
-
-#if (INT_MAX >> 31)
-/* We're set up for 32 bit ints */
-#error need to check size allocation for static buffer 'retbuf'
 #endif
-
-extern char *__ltostr(char *buf, long uval, int base, int uppercase);
+#include <string.h>
 
 /********************** Function strsignal ************************************/
 #ifdef L_strsignal
@@ -82,6 +97,10 @@ const char *const sys_siglist[] = {
 
 #define NUM_KNOWN_SIGNALS    32
 
+#if __BUFLEN_INT10TOSTR > 12
+#error currently set up for 32 bit ints max!
+#endif
+
 static char retbuf[28];                        /* 28 is sufficient for 32 bit ints */
 static const char unknown_signal[] = "Unknown Signal:";
 
@@ -98,8 +117,7 @@ char *strsignal(int sig)
        }
 #endif
 
-       pos = __ltostr(retbuf + sizeof(unknown_signal) + 1, sig, 10, 0)
-               - sizeof(unknown_signal);
+       pos = _int10tostr(retbuf+sizeof(retbuf)-1, sig) - sizeof(unknown_signal);
        strcpy(pos, unknown_signal);
        *(pos + sizeof(unknown_signal) - 1) = ' ';
        return pos;
@@ -109,8 +127,6 @@ char *strsignal(int sig)
 /********************** Function psignal ************************************/
 #ifdef L_psignal
 
-#include <stdio.h>
-
 void psignal(int sig, const char *s)
 {
        fprintf(stderr, "%s: %s\n", s, strsignal(sig));
@@ -147,7 +163,7 @@ int main(void)
 #endif
 
        p = strsignal(INT_MIN);
-       j = strlen(p)+1;
+       j = retbuf+sizeof(retbuf) - p;
        if (j > max) max = j;
        /*printf("strsignal.c - Test of INT_MIN: <%s>  %d\n", p, j);*/