diff options
| author | Pavel Roskin <proski@gnu.org> | 2000-09-13 14:03:48 +0000 |
|---|---|---|
| committer | Pavel Roskin <proski@gnu.org> | 2000-09-13 14:03:48 +0000 |
| commit | 5d513f72568afe4552cfc12880b7744c88bfdd4b (patch) | |
| tree | ba6bab98dcc569e9bf3b6c542888191be62fe09f | |
| parent | dd450a0dedf50067e97e4725e1303758746ddca8 (diff) | |
| download | busybox-w32-5d513f72568afe4552cfc12880b7744c88bfdd4b.tar.gz busybox-w32-5d513f72568afe4552cfc12880b7744c88bfdd4b.tar.bz2 busybox-w32-5d513f72568afe4552cfc12880b7744c88bfdd4b.zip | |
List of signals updated from util-linux-2.10o
Architecture names are no longer used - should now compile on SPARC
| -rw-r--r-- | kill.c | 131 | ||||
| -rw-r--r-- | procps/kill.c | 131 |
2 files changed, 152 insertions, 110 deletions
| @@ -39,62 +39,83 @@ struct signal_name { | |||
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | const struct signal_name signames[] = { | 41 | const struct signal_name signames[] = { |
| 42 | /* Everything, order not important */ | 42 | /* POSIX signals */ |
| 43 | {"HUP", SIGHUP}, | 43 | { "HUP", SIGHUP }, /* 1 */ |
| 44 | {"INT", SIGINT}, | 44 | { "INT", SIGINT }, /* 2 */ |
| 45 | {"QUIT", SIGQUIT}, | 45 | { "QUIT", SIGQUIT }, /* 3 */ |
| 46 | {"ILL", SIGILL}, | 46 | { "ILL", SIGILL }, /* 4 */ |
| 47 | {"TRAP", SIGTRAP}, | 47 | { "ABRT", SIGABRT }, /* 6 */ |
| 48 | {"ABRT", SIGABRT}, | 48 | { "FPE", SIGFPE }, /* 8 */ |
| 49 | {"FPE", SIGFPE}, | 49 | { "KILL", SIGKILL }, /* 9 */ |
| 50 | {"KILL", SIGKILL}, | 50 | { "SEGV", SIGSEGV }, /* 11 */ |
| 51 | {"SEGV", SIGSEGV}, | 51 | { "PIPE", SIGPIPE }, /* 13 */ |
| 52 | {"PIPE", SIGPIPE}, | 52 | { "ALRM", SIGALRM }, /* 14 */ |
| 53 | {"ALRM", SIGALRM}, | 53 | { "TERM", SIGTERM }, /* 15 */ |
| 54 | {"TERM", SIGTERM}, | 54 | { "USR1", SIGUSR1 }, /* 10 (arm,i386,m68k,ppc), 30 (alpha,sparc*), 16 (mips) */ |
| 55 | {"BUS", SIGBUS}, | 55 | { "USR2", SIGUSR2 }, /* 12 (arm,i386,m68k,ppc), 31 (alpha,sparc*), 17 (mips) */ |
| 56 | {"USR1", SIGUSR1}, | 56 | { "CHLD", SIGCHLD }, /* 17 (arm,i386,m68k,ppc), 20 (alpha,sparc*), 18 (mips) */ |
| 57 | {"USR2", SIGUSR2}, | 57 | { "CONT", SIGCONT }, /* 18 (arm,i386,m68k,ppc), 19 (alpha,sparc*), 25 (mips) */ |
| 58 | {"STOP", SIGSTOP}, | 58 | { "STOP", SIGSTOP }, /* 19 (arm,i386,m68k,ppc), 17 (alpha,sparc*), 23 (mips) */ |
| 59 | {"CONT", SIGCONT}, | 59 | { "TSTP", SIGTSTP }, /* 20 (arm,i386,m68k,ppc), 18 (alpha,sparc*), 24 (mips) */ |
| 60 | {"TTIN", SIGTTIN}, | 60 | { "TTIN", SIGTTIN }, /* 21 (arm,i386,m68k,ppc,alpha,sparc*), 26 (mips) */ |
| 61 | {"TTOU", SIGTTOU}, | 61 | { "TTOU", SIGTTOU }, /* 22 (arm,i386,m68k,ppc,alpha,sparc*), 27 (mips) */ |
| 62 | {"IO", SIGIO}, | 62 | /* Miscellaneous other signals */ |
| 63 | {"TSTP", SIGTSTP}, | 63 | #ifdef SIGTRAP |
| 64 | {"CHLD", SIGCHLD}, | 64 | { "TRAP", SIGTRAP }, /* 5 */ |
| 65 | {"XCPU", SIGXCPU}, | ||
| 66 | {"XFSZ", SIGXFSZ}, | ||
| 67 | {"PROF", SIGPROF}, | ||
| 68 | {"WINCH", SIGWINCH}, | ||
| 69 | {"URG", SIGURG}, | ||
| 70 | {"VTALRM", SIGVTALRM}, | ||
| 71 | #ifndef __alpha__ | ||
| 72 | /* everything except alpha */ | ||
| 73 | {"IOT", SIGIOT}, | ||
| 74 | {"POLL", SIGPOLL}, | ||
| 75 | #endif | ||
| 76 | #if defined(__sparc__) || defined(__alpha__) || defined(__mips__) | ||
| 77 | /* everthing except intel */ | ||
| 78 | {"EMT", SIGEMT}, | ||
| 79 | {"SYS", SIGSYS}, | ||
| 80 | # ifdef __alpha__ | ||
| 81 | /* alpha only */ | ||
| 82 | {"LOST", SIGLOST}, | ||
| 83 | #endif | ||
| 84 | #ifdef __sparc__ | ||
| 85 | /* space only */ | ||
| 86 | {"INFO", SIGINFO}, | ||
| 87 | #endif | ||
| 88 | #ifdef __mips__ | ||
| 89 | /* mips only */ | ||
| 90 | {"CLD", SIGCLD}, | ||
| 91 | {"PWR", SIGPWR}, | ||
| 92 | #endif | 65 | #endif |
| 93 | #else | 66 | #ifdef SIGIOT |
| 94 | /* intel only */ | 67 | { "IOT", SIGIOT }, /* 6, same as SIGABRT */ |
| 95 | {"STKFLT", SIGSTKFLT}, | 68 | #endif |
| 96 | {"PWR", SIGPWR}, | 69 | #ifdef SIGEMT |
| 97 | {"UNUSED", SIGUNUSED}, | 70 | { "EMT", SIGEMT }, /* 7 (mips,alpha,sparc*) */ |
| 71 | #endif | ||
| 72 | #ifdef SIGBUS | ||
| 73 | { "BUS", SIGBUS }, /* 7 (arm,i386,m68k,ppc), 10 (mips,alpha,sparc*) */ | ||
| 74 | #endif | ||
| 75 | #ifdef SIGSYS | ||
| 76 | { "SYS", SIGSYS }, /* 12 (mips,alpha,sparc*) */ | ||
| 77 | #endif | ||
| 78 | #ifdef SIGSTKFLT | ||
| 79 | { "STKFLT", SIGSTKFLT }, /* 16 (arm,i386,m68k,ppc) */ | ||
| 80 | #endif | ||
| 81 | #ifdef SIGURG | ||
| 82 | { "URG", SIGURG }, /* 23 (arm,i386,m68k,ppc), 16 (alpha,sparc*), 21 (mips) */ | ||
| 83 | #endif | ||
| 84 | #ifdef SIGIO | ||
| 85 | { "IO", SIGIO }, /* 29 (arm,i386,m68k,ppc), 23 (alpha,sparc*), 22 (mips) */ | ||
| 86 | #endif | ||
| 87 | #ifdef SIGPOLL | ||
| 88 | { "POLL", SIGPOLL }, /* same as SIGIO */ | ||
| 89 | #endif | ||
| 90 | #ifdef SIGCLD | ||
| 91 | { "CLD", SIGCLD }, /* same as SIGCHLD (mips) */ | ||
| 92 | #endif | ||
| 93 | #ifdef SIGXCPU | ||
| 94 | { "XCPU", SIGXCPU }, /* 24 (arm,i386,m68k,ppc,alpha,sparc*), 30 (mips) */ | ||
| 95 | #endif | ||
| 96 | #ifdef SIGXFSZ | ||
| 97 | { "XFSZ", SIGXFSZ }, /* 25 (arm,i386,m68k,ppc,alpha,sparc*), 31 (mips) */ | ||
| 98 | #endif | ||
| 99 | #ifdef SIGVTALRM | ||
| 100 | { "VTALRM", SIGVTALRM }, /* 26 (arm,i386,m68k,ppc,alpha,sparc*), 28 (mips) */ | ||
| 101 | #endif | ||
| 102 | #ifdef SIGPROF | ||
| 103 | { "PROF", SIGPROF }, /* 27 (arm,i386,m68k,ppc,alpha,sparc*), 29 (mips) */ | ||
| 104 | #endif | ||
| 105 | #ifdef SIGPWR | ||
| 106 | { "PWR", SIGPWR }, /* 30 (arm,i386,m68k,ppc), 29 (alpha,sparc*), 19 (mips) */ | ||
| 107 | #endif | ||
| 108 | #ifdef SIGINFO | ||
| 109 | { "INFO", SIGINFO }, /* 29 (alpha) */ | ||
| 110 | #endif | ||
| 111 | #ifdef SIGLOST | ||
| 112 | { "LOST", SIGLOST }, /* 29 (arm,i386,m68k,ppc,sparc*) */ | ||
| 113 | #endif | ||
| 114 | #ifdef SIGWINCH | ||
| 115 | { "WINCH", SIGWINCH }, /* 28 (arm,i386,m68k,ppc,alpha,sparc*), 20 (mips) */ | ||
| 116 | #endif | ||
| 117 | #ifdef SIGUNUSED | ||
| 118 | { "UNUSED", SIGUNUSED }, /* 31 (arm,i386,m68k,ppc) */ | ||
| 98 | #endif | 119 | #endif |
| 99 | {0, 0} | 120 | {0, 0} |
| 100 | }; | 121 | }; |
diff --git a/procps/kill.c b/procps/kill.c index dc48d4337..8f48ba026 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
| @@ -39,62 +39,83 @@ struct signal_name { | |||
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | const struct signal_name signames[] = { | 41 | const struct signal_name signames[] = { |
| 42 | /* Everything, order not important */ | 42 | /* POSIX signals */ |
| 43 | {"HUP", SIGHUP}, | 43 | { "HUP", SIGHUP }, /* 1 */ |
| 44 | {"INT", SIGINT}, | 44 | { "INT", SIGINT }, /* 2 */ |
| 45 | {"QUIT", SIGQUIT}, | 45 | { "QUIT", SIGQUIT }, /* 3 */ |
| 46 | {"ILL", SIGILL}, | 46 | { "ILL", SIGILL }, /* 4 */ |
| 47 | {"TRAP", SIGTRAP}, | 47 | { "ABRT", SIGABRT }, /* 6 */ |
| 48 | {"ABRT", SIGABRT}, | 48 | { "FPE", SIGFPE }, /* 8 */ |
| 49 | {"FPE", SIGFPE}, | 49 | { "KILL", SIGKILL }, /* 9 */ |
| 50 | {"KILL", SIGKILL}, | 50 | { "SEGV", SIGSEGV }, /* 11 */ |
| 51 | {"SEGV", SIGSEGV}, | 51 | { "PIPE", SIGPIPE }, /* 13 */ |
| 52 | {"PIPE", SIGPIPE}, | 52 | { "ALRM", SIGALRM }, /* 14 */ |
| 53 | {"ALRM", SIGALRM}, | 53 | { "TERM", SIGTERM }, /* 15 */ |
| 54 | {"TERM", SIGTERM}, | 54 | { "USR1", SIGUSR1 }, /* 10 (arm,i386,m68k,ppc), 30 (alpha,sparc*), 16 (mips) */ |
| 55 | {"BUS", SIGBUS}, | 55 | { "USR2", SIGUSR2 }, /* 12 (arm,i386,m68k,ppc), 31 (alpha,sparc*), 17 (mips) */ |
| 56 | {"USR1", SIGUSR1}, | 56 | { "CHLD", SIGCHLD }, /* 17 (arm,i386,m68k,ppc), 20 (alpha,sparc*), 18 (mips) */ |
| 57 | {"USR2", SIGUSR2}, | 57 | { "CONT", SIGCONT }, /* 18 (arm,i386,m68k,ppc), 19 (alpha,sparc*), 25 (mips) */ |
| 58 | {"STOP", SIGSTOP}, | 58 | { "STOP", SIGSTOP }, /* 19 (arm,i386,m68k,ppc), 17 (alpha,sparc*), 23 (mips) */ |
| 59 | {"CONT", SIGCONT}, | 59 | { "TSTP", SIGTSTP }, /* 20 (arm,i386,m68k,ppc), 18 (alpha,sparc*), 24 (mips) */ |
| 60 | {"TTIN", SIGTTIN}, | 60 | { "TTIN", SIGTTIN }, /* 21 (arm,i386,m68k,ppc,alpha,sparc*), 26 (mips) */ |
| 61 | {"TTOU", SIGTTOU}, | 61 | { "TTOU", SIGTTOU }, /* 22 (arm,i386,m68k,ppc,alpha,sparc*), 27 (mips) */ |
| 62 | {"IO", SIGIO}, | 62 | /* Miscellaneous other signals */ |
| 63 | {"TSTP", SIGTSTP}, | 63 | #ifdef SIGTRAP |
| 64 | {"CHLD", SIGCHLD}, | 64 | { "TRAP", SIGTRAP }, /* 5 */ |
| 65 | {"XCPU", SIGXCPU}, | ||
| 66 | {"XFSZ", SIGXFSZ}, | ||
| 67 | {"PROF", SIGPROF}, | ||
| 68 | {"WINCH", SIGWINCH}, | ||
| 69 | {"URG", SIGURG}, | ||
| 70 | {"VTALRM", SIGVTALRM}, | ||
| 71 | #ifndef __alpha__ | ||
| 72 | /* everything except alpha */ | ||
| 73 | {"IOT", SIGIOT}, | ||
| 74 | {"POLL", SIGPOLL}, | ||
| 75 | #endif | ||
| 76 | #if defined(__sparc__) || defined(__alpha__) || defined(__mips__) | ||
| 77 | /* everthing except intel */ | ||
| 78 | {"EMT", SIGEMT}, | ||
| 79 | {"SYS", SIGSYS}, | ||
| 80 | # ifdef __alpha__ | ||
| 81 | /* alpha only */ | ||
| 82 | {"LOST", SIGLOST}, | ||
| 83 | #endif | ||
| 84 | #ifdef __sparc__ | ||
| 85 | /* space only */ | ||
| 86 | {"INFO", SIGINFO}, | ||
| 87 | #endif | ||
| 88 | #ifdef __mips__ | ||
| 89 | /* mips only */ | ||
| 90 | {"CLD", SIGCLD}, | ||
| 91 | {"PWR", SIGPWR}, | ||
| 92 | #endif | 65 | #endif |
| 93 | #else | 66 | #ifdef SIGIOT |
| 94 | /* intel only */ | 67 | { "IOT", SIGIOT }, /* 6, same as SIGABRT */ |
| 95 | {"STKFLT", SIGSTKFLT}, | 68 | #endif |
| 96 | {"PWR", SIGPWR}, | 69 | #ifdef SIGEMT |
| 97 | {"UNUSED", SIGUNUSED}, | 70 | { "EMT", SIGEMT }, /* 7 (mips,alpha,sparc*) */ |
| 71 | #endif | ||
| 72 | #ifdef SIGBUS | ||
| 73 | { "BUS", SIGBUS }, /* 7 (arm,i386,m68k,ppc), 10 (mips,alpha,sparc*) */ | ||
| 74 | #endif | ||
| 75 | #ifdef SIGSYS | ||
| 76 | { "SYS", SIGSYS }, /* 12 (mips,alpha,sparc*) */ | ||
| 77 | #endif | ||
| 78 | #ifdef SIGSTKFLT | ||
| 79 | { "STKFLT", SIGSTKFLT }, /* 16 (arm,i386,m68k,ppc) */ | ||
| 80 | #endif | ||
| 81 | #ifdef SIGURG | ||
| 82 | { "URG", SIGURG }, /* 23 (arm,i386,m68k,ppc), 16 (alpha,sparc*), 21 (mips) */ | ||
| 83 | #endif | ||
| 84 | #ifdef SIGIO | ||
| 85 | { "IO", SIGIO }, /* 29 (arm,i386,m68k,ppc), 23 (alpha,sparc*), 22 (mips) */ | ||
| 86 | #endif | ||
| 87 | #ifdef SIGPOLL | ||
| 88 | { "POLL", SIGPOLL }, /* same as SIGIO */ | ||
| 89 | #endif | ||
| 90 | #ifdef SIGCLD | ||
| 91 | { "CLD", SIGCLD }, /* same as SIGCHLD (mips) */ | ||
| 92 | #endif | ||
| 93 | #ifdef SIGXCPU | ||
| 94 | { "XCPU", SIGXCPU }, /* 24 (arm,i386,m68k,ppc,alpha,sparc*), 30 (mips) */ | ||
| 95 | #endif | ||
| 96 | #ifdef SIGXFSZ | ||
| 97 | { "XFSZ", SIGXFSZ }, /* 25 (arm,i386,m68k,ppc,alpha,sparc*), 31 (mips) */ | ||
| 98 | #endif | ||
| 99 | #ifdef SIGVTALRM | ||
| 100 | { "VTALRM", SIGVTALRM }, /* 26 (arm,i386,m68k,ppc,alpha,sparc*), 28 (mips) */ | ||
| 101 | #endif | ||
| 102 | #ifdef SIGPROF | ||
| 103 | { "PROF", SIGPROF }, /* 27 (arm,i386,m68k,ppc,alpha,sparc*), 29 (mips) */ | ||
| 104 | #endif | ||
| 105 | #ifdef SIGPWR | ||
| 106 | { "PWR", SIGPWR }, /* 30 (arm,i386,m68k,ppc), 29 (alpha,sparc*), 19 (mips) */ | ||
| 107 | #endif | ||
| 108 | #ifdef SIGINFO | ||
| 109 | { "INFO", SIGINFO }, /* 29 (alpha) */ | ||
| 110 | #endif | ||
| 111 | #ifdef SIGLOST | ||
| 112 | { "LOST", SIGLOST }, /* 29 (arm,i386,m68k,ppc,sparc*) */ | ||
| 113 | #endif | ||
| 114 | #ifdef SIGWINCH | ||
| 115 | { "WINCH", SIGWINCH }, /* 28 (arm,i386,m68k,ppc,alpha,sparc*), 20 (mips) */ | ||
| 116 | #endif | ||
| 117 | #ifdef SIGUNUSED | ||
| 118 | { "UNUSED", SIGUNUSED }, /* 31 (arm,i386,m68k,ppc) */ | ||
| 98 | #endif | 119 | #endif |
| 99 | {0, 0} | 120 | {0, 0} |
| 100 | }; | 121 | }; |
