diff options
| author | Eric Andersen | 2000-07-06 17:05:33 +0000 |
|---|---|---|
| committer | Eric Andersen | 2000-07-06 17:05:33 +0000 |
| commit | 3cfa9ec09cbd6742abee95526912269fd2e62a4c (patch) | |
| tree | 03381b63f0a5b3664130945107394543da14b189 | |
| parent | 6f5e281479193fb2cf76a18017f3df9d9f1b8941 (diff) | |
| download | busybox-3cfa9ec09cbd6742abee95526912269fd2e62a4c.zip busybox-3cfa9ec09cbd6742abee95526912269fd2e62a4c.tar.gz | |
Reorganized signal names for better architecture support -- patch
thanks to simon wood <simon@mungewell.uklinux.net>
-Erik
| -rw-r--r-- | kill.c | 76 | ||||
| -rw-r--r-- | procps/kill.c | 76 |
2 files changed, 60 insertions, 92 deletions
@@ -58,76 +58,60 @@ struct signal_name { }; const struct signal_name signames[] = { + /* Everything, order not important */ {"HUP", SIGHUP}, {"INT", SIGINT}, {"QUIT", SIGQUIT}, {"ILL", SIGILL}, {"TRAP", SIGTRAP}, {"ABRT", SIGABRT}, -#ifndef __alpha__ - {"IOT", SIGIOT}, -#endif -#if defined(__sparc__) || defined(__alpha__) - {"EMT", SIGEMT}, -#else - {"BUS", SIGBUS}, -#endif {"FPE", SIGFPE}, {"KILL", SIGKILL}, -#if defined(__sparc__) || defined(__alpha__) - {"BUS", SIGBUS}, -#else - {"USR1", SIGUSR1}, -#endif {"SEGV", SIGSEGV}, -#if defined(__sparc__) || defined(__alpha__) - {"SYS", SIGSYS}, -#else - {"USR2", SIGUSR2}, -#endif {"PIPE", SIGPIPE}, {"ALRM", SIGALRM}, {"TERM", SIGTERM}, -#if defined(__sparc__) || defined(__alpha__) - {"URG", SIGURG}, + {"BUS", SIGBUS}, + {"USR1", SIGUSR1}, + {"USR2", SIGUSR2}, {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, {"CONT", SIGCONT}, - {"CHLD", SIGCHLD}, {"TTIN", SIGTTIN}, {"TTOU", SIGTTOU}, {"IO", SIGIO}, -# ifndef __alpha__ - {"POLL", SIGIO}, -# endif + {"TSTP", SIGTSTP}, + {"CHLD", SIGCHLD}, {"XCPU", SIGXCPU}, {"XFSZ", SIGXFSZ}, - {"VTALRM", SIGVTALRM}, {"PROF", SIGPROF}, {"WINCH", SIGWINCH}, -# ifdef __alpha__ - {"INFO", SIGINFO}, -# else - {"LOST", SIGLOST}, -# endif - {"USR1", SIGUSR1}, - {"USR2", SIGUSR2}, -#else - {"STKFLT", SIGSTKFLT}, - {"CHLD", SIGCHLD}, - {"CONT", SIGCONT}, - {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, - {"TTIN", SIGTTIN}, - {"TTOU", SIGTTOU}, {"URG", SIGURG}, - {"XCPU", SIGXCPU}, - {"XFSZ", SIGXFSZ}, {"VTALRM", SIGVTALRM}, - {"PROF", SIGPROF}, - {"WINCH", SIGWINCH}, - {"IO", SIGIO}, +#ifndef __alpha__ + /* everything except alpha */ + {"IOT", SIGIOT}, {"POLL", SIGPOLL}, +#endif +#if defined(__sparc__) || defined(__alpha__) || defined(__mips__) + /* everthing except intel */ + {"EMT", SIGEMT}, + {"SYS", SIGSYS}, +# ifdef __alpha__ + /* alpha only */ + {"LOST", SIGLOST}, +#endif +#ifdef __sparc__ + /* space only */ + {"INFO", SIGINFO}, +#endif +#ifdef __mips__ + /* mips only */ + {"CLD", SIGCLD}, + {"PWR", SIGPWR}, +#endif +#else + /* intel only */ + {"STKFLT", SIGSTKFLT}, {"PWR", SIGPWR}, {"UNUSED", SIGUNUSED}, #endif diff --git a/procps/kill.c b/procps/kill.c index 75277d9..a0b93be 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -58,76 +58,60 @@ struct signal_name { }; const struct signal_name signames[] = { + /* Everything, order not important */ {"HUP", SIGHUP}, {"INT", SIGINT}, {"QUIT", SIGQUIT}, {"ILL", SIGILL}, {"TRAP", SIGTRAP}, {"ABRT", SIGABRT}, -#ifndef __alpha__ - {"IOT", SIGIOT}, -#endif -#if defined(__sparc__) || defined(__alpha__) - {"EMT", SIGEMT}, -#else - {"BUS", SIGBUS}, -#endif {"FPE", SIGFPE}, {"KILL", SIGKILL}, -#if defined(__sparc__) || defined(__alpha__) - {"BUS", SIGBUS}, -#else - {"USR1", SIGUSR1}, -#endif {"SEGV", SIGSEGV}, -#if defined(__sparc__) || defined(__alpha__) - {"SYS", SIGSYS}, -#else - {"USR2", SIGUSR2}, -#endif {"PIPE", SIGPIPE}, {"ALRM", SIGALRM}, {"TERM", SIGTERM}, -#if defined(__sparc__) || defined(__alpha__) - {"URG", SIGURG}, + {"BUS", SIGBUS}, + {"USR1", SIGUSR1}, + {"USR2", SIGUSR2}, {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, {"CONT", SIGCONT}, - {"CHLD", SIGCHLD}, {"TTIN", SIGTTIN}, {"TTOU", SIGTTOU}, {"IO", SIGIO}, -# ifndef __alpha__ - {"POLL", SIGIO}, -# endif + {"TSTP", SIGTSTP}, + {"CHLD", SIGCHLD}, {"XCPU", SIGXCPU}, {"XFSZ", SIGXFSZ}, - {"VTALRM", SIGVTALRM}, {"PROF", SIGPROF}, {"WINCH", SIGWINCH}, -# ifdef __alpha__ - {"INFO", SIGINFO}, -# else - {"LOST", SIGLOST}, -# endif - {"USR1", SIGUSR1}, - {"USR2", SIGUSR2}, -#else - {"STKFLT", SIGSTKFLT}, - {"CHLD", SIGCHLD}, - {"CONT", SIGCONT}, - {"STOP", SIGSTOP}, - {"TSTP", SIGTSTP}, - {"TTIN", SIGTTIN}, - {"TTOU", SIGTTOU}, {"URG", SIGURG}, - {"XCPU", SIGXCPU}, - {"XFSZ", SIGXFSZ}, {"VTALRM", SIGVTALRM}, - {"PROF", SIGPROF}, - {"WINCH", SIGWINCH}, - {"IO", SIGIO}, +#ifndef __alpha__ + /* everything except alpha */ + {"IOT", SIGIOT}, {"POLL", SIGPOLL}, +#endif +#if defined(__sparc__) || defined(__alpha__) || defined(__mips__) + /* everthing except intel */ + {"EMT", SIGEMT}, + {"SYS", SIGSYS}, +# ifdef __alpha__ + /* alpha only */ + {"LOST", SIGLOST}, +#endif +#ifdef __sparc__ + /* space only */ + {"INFO", SIGINFO}, +#endif +#ifdef __mips__ + /* mips only */ + {"CLD", SIGCLD}, + {"PWR", SIGPWR}, +#endif +#else + /* intel only */ + {"STKFLT", SIGSTKFLT}, {"PWR", SIGPWR}, {"UNUSED", SIGUNUSED}, #endif |