Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity
e190c16636
hush/libbb/u_signal_names.c

162 lines
3.0 KiB
C
Raw Normal View History

Major rework of the directory structure and the entire build system. -Erik
2001-10-24 05:00:29 +00:00
/* vi: set sw=4 ts=4: */
/*
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.
2006-07-12 19:17:55 +00:00
* Signal name/number conversion routines.
Major rework of the directory structure and the entire build system. -Erik
2001-10-24 05:00:29 +00:00
*
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.
2006-07-12 19:17:55 +00:00
* Copyright 2006 Rob Landley <rob@landley.net>
Major rework of the directory structure and the entire build system. -Erik
2001-10-24 05:00:29 +00:00
*
- move buffer allocation schemes to libbb.h - include the correct headers: applets need busybox.h while lib* need libbb.h
2006-04-03 16:39:31 +00:00
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
Major rework of the directory structure and the entire build system. -Erik
2001-10-24 05:00:29 +00:00
*/
- move buffer allocation schemes to libbb.h - include the correct headers: applets need busybox.h while lib* need libbb.h
2006-04-03 16:39:31 +00:00
#include "libbb.h"
test: code size saving, no logic changes ps: fix warning, make a bit smaller kill -l: make smaller & know much more signals function old new delta get_signum 121 153 +32 kill_main 826 843 +17 get_signame 44 36 -8 signals 252 224 -28 .rodata 131955 131923 -32 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/3 up/down: 49/-68) Total: -19 bytes
2007-05-01 20:07:29 +00:00
static const char signals[32][7] = {
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.
2006-07-12 19:17:55 +00:00
// SUSv3 says kill must support these, and specifies the numerical values,
// http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html
fix recognitions of -SIGname signals (fix by Jacques LUDER <jacques.luder@thalesgroup.com>)
2006-12-23 01:06:21 +00:00
// TODO: "[SIG]EXIT" shouldn't work for kill, right?
test: code size saving, no logic changes ps: fix warning, make a bit smaller kill -l: make smaller & know much more signals function old new delta get_signum 121 153 +32 kill_main 826 843 +17 get_signame 44 36 -8 signals 252 224 -28 .rodata 131955 131923 -32 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/3 up/down: 49/-68) Total: -19 bytes
2007-05-01 20:07:29 +00:00
// {0, "EXIT"}, {1, "HUP"}, {2, "INT"}, {3, "QUIT"},
// {6, "ABRT"}, {9, "KILL"}, {14, "ALRM"}, {15, "TERM"}
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.
2006-07-12 19:17:55 +00:00
// And Posix adds the following:
test: code size saving, no logic changes ps: fix warning, make a bit smaller kill -l: make smaller & know much more signals function old new delta get_signum 121 153 +32 kill_main 826 843 +17 get_signame 44 36 -8 signals 252 224 -28 .rodata 131955 131923 -32 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/3 up/down: 49/-68) Total: -19 bytes
2007-05-01 20:07:29 +00:00
// {SIGILL, "ILL"}, {SIGTRAP, "TRAP"}, {SIGFPE, "FPE"}, {SIGUSR1, "USR1"},
// {SIGSEGV, "SEGV"}, {SIGUSR2, "USR2"}, {SIGPIPE, "PIPE"}, {SIGCHLD, "CHLD"},
// {SIGCONT, "CONT"}, {SIGSTOP, "STOP"}, {SIGTSTP, "TSTP"}, {SIGTTIN, "TTIN"},
// {SIGTTOU, "TTOU"}
[0] = "EXIT",
#ifdef SIGHUP
[SIGHUP ] = "HUP",
#endif
#ifdef SIGINT
[SIGINT ] = "INT",
#endif
#ifdef SIGQUIT
[SIGQUIT ] = "QUIT",
#endif
#ifdef SIGILL
[SIGILL ] = "ILL",
#endif
#ifdef SIGTRAP
[SIGTRAP ] = "TRAP",
#endif
#ifdef SIGABRT
[SIGABRT ] = "ABRT",
#endif
#ifdef SIGBUS
[SIGBUS ] = "BUS",
#endif
#ifdef SIGFPE
[SIGFPE ] = "FPE",
#endif
#ifdef SIGKILL
[SIGKILL ] = "KILL",
#endif
#ifdef SIGUSR1
[SIGUSR1 ] = "USR1",
#endif
#ifdef SIGSEGV
[SIGSEGV ] = "SEGV",
#endif
#ifdef SIGUSR2
[SIGUSR2 ] = "USR2",
#endif
#ifdef SIGPIPE
[SIGPIPE ] = "PIPE",
#endif
#ifdef SIGALRM
[SIGALRM ] = "ALRM",
#endif
#ifdef SIGTERM
[SIGTERM ] = "TERM",
#endif
#ifdef SIGSTKFLT
[SIGSTKFLT] = "STKFLT",
#endif
#ifdef SIGCHLD
[SIGCHLD ] = "CHLD",
#endif
#ifdef SIGCONT
[SIGCONT ] = "CONT",
#endif
#ifdef SIGSTOP
[SIGSTOP ] = "STOP",
#endif
#ifdef SIGTSTP
[SIGTSTP ] = "TSTP",
#endif
#ifdef SIGTTIN
[SIGTTIN ] = "TTIN",
#endif
#ifdef SIGTTOU
[SIGTTOU ] = "TTOU",
#endif
#ifdef SIGURG
[SIGURG ] = "URG",
#endif
#ifdef SIGXCPU
[SIGXCPU ] = "XCPU",
#endif
#ifdef SIGXFSZ
[SIGXFSZ ] = "XFSZ",
#endif
#ifdef SIGVTALRM
[SIGVTALRM] = "VTALRM",
#endif
#ifdef SIGPROF
[SIGPROF ] = "PROF",
#endif
#ifdef SIGWINCH
[SIGWINCH ] = "WINCH",
#endif
#ifdef SIGPOLL
[SIGPOLL ] = "POLL",
#endif
#ifdef SIGPWR
[SIGPWR ] = "PWR",
#endif
#ifdef SIGSYS
[SIGSYS ] = "SYS",
#endif
Oops. I forgot to commit this part of vodz' patch.
2001-08-02 05:18:55 +00:00
};
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.
2006-07-12 19:17:55 +00:00
// Convert signal name to number.
Oops. I forgot to commit this part of vodz' patch.
2001-08-02 05:18:55 +00:00
kill: fix bugs (kill -l output was horrible), fix style, constify data
2006-09-27 14:19:16 +00:00
int get_signum(const char *name)
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.
2006-07-12 19:17:55 +00:00
{
int i;
fix recognitions of -SIGname signals (fix by Jacques LUDER <jacques.luder@thalesgroup.com>)
2006-12-23 01:06:21 +00:00
i = bb_strtou(name, NULL, 10);
test: code size saving, no logic changes ps: fix warning, make a bit smaller kill -l: make smaller & know much more signals function old new delta get_signum 121 153 +32 kill_main 826 843 +17 get_signame 44 36 -8 signals 252 224 -28 .rodata 131955 131923 -32 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/3 up/down: 49/-68) Total: -19 bytes
2007-05-01 20:07:29 +00:00
if (!errno)
return i;
if (strncasecmp(name, "SIG", 3) == 0)
name += 3;
Consolidate ARRAY_SIZE macro; remove one unneeded global var (walter harms <wharms@bfs.de>)
2007-06-25 10:55:35 +00:00
for (i = 0; i < ARRAY_SIZE(signals); i++)
test: code size saving, no logic changes ps: fix warning, make a bit smaller kill -l: make smaller & know much more signals function old new delta get_signum 121 153 +32 kill_main 826 843 +17 get_signame 44 36 -8 signals 252 224 -28 .rodata 131955 131923 -32 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/3 up/down: 49/-68) Total: -19 bytes
2007-05-01 20:07:29 +00:00
if (strcasecmp(name, signals[i]) == 0)
return i;
#if ENABLE_DESKTOP && (defined(SIGIOT) || defined(SIGIO))
/* These are aliased to other names */
if ((name[0] | 0x20) == 'i' && (name[1] | 0x20) == 'o') {
#ifdef SIGIO
if (!name[2])
return SIGIO;
#endif
#ifdef SIGIOT
if ((name[2] | 0x20) == 't' && !name[3])
return SIGIOT;
#endif
}
#endif
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.
2006-07-12 19:17:55 +00:00
return -1;
}
Oops. I forgot to commit this part of vodz' patch.
2001-08-02 05:18:55 +00:00
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.
2006-07-12 19:17:55 +00:00
// Convert signal number to name
Oops. I forgot to commit this part of vodz' patch.
2001-08-02 05:18:55 +00:00
kill: fix bugs (kill -l output was horrible), fix style, constify data
2006-09-27 14:19:16 +00:00
const char *get_signame(int number)
Oops. I forgot to commit this part of vodz' patch.
2001-08-02 05:18:55 +00:00
{
Consolidate ARRAY_SIZE macro; remove one unneeded global var (walter harms <wharms@bfs.de>)
2007-06-25 10:55:35 +00:00
if ((unsigned)number < ARRAY_SIZE(signals)) {
test: code size saving, no logic changes ps: fix warning, make a bit smaller kill -l: make smaller & know much more signals function old new delta get_signum 121 153 +32 kill_main 826 843 +17 get_signame 44 36 -8 signals 252 224 -28 .rodata 131955 131923 -32 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/3 up/down: 49/-68) Total: -19 bytes
2007-05-01 20:07:29 +00:00
if (signals[number][0]) /* if it's not an empty str */
return signals[number];
Oops. I forgot to commit this part of vodz' patch.
2001-08-02 05:18:55 +00:00
}
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.
2006-07-12 19:17:55 +00:00
stop using (yet another) static buffer
2007-03-14 21:56:51 +00:00
return itoa(number);
Oops. I forgot to commit this part of vodz' patch.
2001-08-02 05:18:55 +00:00
}
Reference in New Issue Copy Permalink