A couple things that got tangled up in my tree, easier to check in both than

untangle them:

Rewrite u_signal_names() into get_signum() and get_signame(), plus trim the
signal list to that required by posix (they can specify the numbers for
the rest if they really need them).  (This is preparatory cleanup for adding
a timeout applet like Roberto Foglietta wants.)

Export the itoa (added due to Denis Vlasenko, although it's not quite his
preferred implementation) from xfuncs.c so it's actually used, and remove
several other redundant implementations of itoa and utoa() in the tree.

1 files changed, 40 insertions, 160 deletions

diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index bf65fa3e9..62fab810d 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -1,179 +1,59 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Utility routines.
+ * Signal name/number conversion routines.
  *
- * Copyright (C) many different people.
- * If you wrote this, please acknowledge your work.
+ * Copyright 2006 Rob Landley <rob@landley.net>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <signal.h>
-#include <ctype.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "libbb.h"
 
-struct signal_name {
-	const char *name;
+static struct signal_name {
+	char *name;
 	int number;
+} signals[] = {
+	// SUSv3 says kill must support these, and specifies the numerical values,
+	// http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html
+	{"0", 0}, {"HUP", 1}, {"INT", 2}, {"QUIT", 3}, {"ABRT", 6}, {"KILL", 9},
+   	{"ALRM", 14}, {"TERM", 15},
+	// And Posix adds the following:
+	{"ILL", SIGILL}, {"TRAP", SIGTRAP}, {"FPE", SIGFPE}, {"USR1", SIGUSR1},
+   	{"SEGV", SIGSEGV}, {"USR2", SIGUSR2}, {"PIPE", SIGPIPE}, {"CHLD", SIGCHLD},
+   	{"CONT", SIGCONT}, {"STOP", SIGSTOP}, {"TSTP", SIGTSTP}, {"TTIN", SIGTTIN},
+   	{"TTOU", SIGTTOU}
 };
 
-static const struct signal_name signames[] = {
-	/* POSIX signals */
-	{ "EXIT",       0 },            /* 0 */
-	{ "HUP",        SIGHUP },       /* 1 */
-	{ "INT",        SIGINT },       /* 2 */
-	{ "QUIT",       SIGQUIT },      /* 3 */
-	{ "ILL",        SIGILL },       /* 4 */
-	{ "ABRT",       SIGABRT },      /* 6 */
-	{ "FPE",        SIGFPE },       /* 8 */
-	{ "KILL",       SIGKILL },      /* 9 */
-	{ "SEGV",       SIGSEGV },      /* 11 */
-	{ "PIPE",       SIGPIPE },      /* 13 */
-	{ "ALRM",       SIGALRM },      /* 14 */
-	{ "TERM",       SIGTERM },      /* 15 */
-	{ "USR1",       SIGUSR1 },      /* 10 (arm,i386,m68k,ppc), 30 (alpha,sparc*), 16 (mips) */
-	{ "USR2",       SIGUSR2 },      /* 12 (arm,i386,m68k,ppc), 31 (alpha,sparc*), 17 (mips) */
-	{ "CHLD",       SIGCHLD },      /* 17 (arm,i386,m68k,ppc), 20 (alpha,sparc*), 18 (mips) */
-	{ "CONT",       SIGCONT },      /* 18 (arm,i386,m68k,ppc), 19 (alpha,sparc*), 25 (mips) */
-	{ "STOP",       SIGSTOP },      /* 19 (arm,i386,m68k,ppc), 17 (alpha,sparc*), 23 (mips) */
-	{ "TSTP",       SIGTSTP },      /* 20 (arm,i386,m68k,ppc), 18 (alpha,sparc*), 24 (mips) */
-	{ "TTIN",       SIGTTIN },      /* 21 (arm,i386,m68k,ppc,alpha,sparc*), 26 (mips) */
-	{ "TTOU",       SIGTTOU },      /* 22 (arm,i386,m68k,ppc,alpha,sparc*), 27 (mips) */
-	/* Miscellaneous other signals */
-#ifdef SIGTRAP
-	{ "TRAP",       SIGTRAP },      /* 5 */
-#endif
-#ifdef SIGIOT
-	{ "IOT",        SIGIOT },       /* 6, same as SIGABRT */
-#endif
-#ifdef SIGEMT
-	{ "EMT",        SIGEMT },       /* 7 (mips,alpha,sparc*) */
-#endif
-#ifdef SIGBUS
-	{ "BUS",        SIGBUS },       /* 7 (arm,i386,m68k,ppc), 10 (mips,alpha,sparc*) */
-#endif
-#ifdef SIGSYS
-	{ "SYS",        SIGSYS },       /* 12 (mips,alpha,sparc*) */
-#endif
-#ifdef SIGSTKFLT
-	{ "STKFLT",     SIGSTKFLT },    /* 16 (arm,i386,m68k,ppc) */
-#endif
-#ifdef SIGURG
-	{ "URG",        SIGURG },       /* 23 (arm,i386,m68k,ppc), 16 (alpha,sparc*), 21 (mips) */
-#endif
-#ifdef SIGIO
-	{ "IO",         SIGIO },        /* 29 (arm,i386,m68k,ppc), 23 (alpha,sparc*), 22 (mips) */
-#endif
-#ifdef SIGPOLL
-	{ "POLL",       SIGPOLL },      /* same as SIGIO */
-#endif
-#ifdef SIGCLD
-	{ "CLD",        SIGCLD },       /* same as SIGCHLD (mips) */
-#endif
-#ifdef SIGXCPU
-	{ "XCPU",       SIGXCPU },      /* 24 (arm,i386,m68k,ppc,alpha,sparc*), 30 (mips) */
-#endif
-#ifdef SIGXFSZ
-	{ "XFSZ",       SIGXFSZ },      /* 25 (arm,i386,m68k,ppc,alpha,sparc*), 31 (mips) */
-#endif
-#ifdef SIGVTALRM
-	{ "VTALRM",     SIGVTALRM },    /* 26 (arm,i386,m68k,ppc,alpha,sparc*), 28 (mips) */
-#endif
-#ifdef SIGPROF
-	{ "PROF",       SIGPROF },      /* 27 (arm,i386,m68k,ppc,alpha,sparc*), 29 (mips) */
-#endif
-#ifdef SIGPWR
-	{ "PWR",        SIGPWR },       /* 30 (arm,i386,m68k,ppc), 29 (alpha,sparc*), 19 (mips) */
-#endif
-#ifdef SIGINFO
-	{ "INFO",       SIGINFO },      /* 29 (alpha) */
-#endif
-#ifdef SIGLOST
-	{ "LOST",       SIGLOST },      /* 29 (arm,i386,m68k,ppc,sparc*) */
-#endif
-#ifdef SIGWINCH
-	{ "WINCH",      SIGWINCH },     /* 28 (arm,i386,m68k,ppc,alpha,sparc*), 20 (mips) */
-#endif
-#ifdef SIGUNUSED
-	{ "UNUSED",     SIGUNUSED },    /* 31 (arm,i386,m68k,ppc) */
-#endif
-	{0, 0}
-};
+// Convert signal name to number.
 
-/*
-	if str_sig == NULL returned signal name [*signo],
-	if str_sig != NULL - set *signo from signal_name,
-		findings with digit number or with or without SIG-prefix name
-
-	if startnum=0 flag for support finding zero signal,
-		but str_sig="0" always found, (hmm - standart or realize?)
-	if startnum<0 returned reverse signal_number  <-> signal_name
-	if found error - returned NULL
+int get_signum(char *name)
+{
+	int i;
+
+	i = atoi(name);
+	if(i) return i;
+	for(i=0; i < sizeof(signals) / sizeof(struct signal_name); i++)
+		if (!strcasecmp(signals[i].name, name) ||
+			(!strncasecmp(signals[i].name, "SIG", 3)
+				 && !strcasecmp(signals[i].name+3, signals[i].name)))
+					return signals[i].number;
+	return -1;
+}
 
-*/
+// Convert signal number to name
 
-const char *
-u_signal_names(const char *str_sig, int *signo, int startnum)
+char *get_signame(int number)
 {
-	static char retstr[16];
-	const struct signal_name *s = signames;
-	static const char prefix[] = "SIG";
-	const char *sptr;
-
-	if(startnum)
-		s++;
-	if(str_sig==NULL) {
-		while (s->name != 0) {
-			if(s->number == *signo)
-				break;
-			s++;
-		}
-	} else {
-		if (isdigit(((unsigned char)*str_sig))) {
-			char *endp;
-			long int sn = strtol(str_sig, &endp, 10);
-			/* test correct and overflow */
-			if(*endp == 0 && sn >= 0 && sn < NSIG) {
-				*signo = (int)sn;
-				/* test for unnamed */
-				sptr = u_signal_names(0, signo, 0);
-				if(sptr==NULL)
-					return NULL;
-				if(sn!=0)
-					sptr += 3;
-				return sptr;
-			}
-		} else {
-			sptr = str_sig;
-			while (s->name != 0) {
-				if (strcasecmp(s->name, sptr) == 0) {
-					*signo = s->number;
-					if(startnum<0) {
-						sprintf(retstr, "%d", *signo);
-						return retstr;
-					}
-					break;
-				}
-				if(s!=signames && sptr == str_sig &&
-						strncasecmp(sptr, prefix, 3) == 0) {
-					sptr += 3;      /* strlen(prefix) */
-					continue;
-				}
-				sptr = str_sig;
-				s++;
-			}
+	int i;
+	static char buf[8];
+
+	itoa_to_buf(number, buf, 8);
+	for (i=0; i < sizeof(signals) / sizeof(struct signal_name); i++) {
+		if (number == signals[i].number) {
+			sprintf("SIG%s", signals[i].name);
+			break;
 		}
 	}
-	if(s->name==0)
-		return NULL;
-	if(s!=signames)
-		strcpy(retstr, prefix);
-	 else
-		retstr[0] = 0;
-	return strcat(retstr, s->name);
+
+	return buf;
 }