Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/u_signal_names.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/u_signal_names.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/libbb/u_signal_names.c

@@ -5 +5 @@
  * Copyright 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
-static const char signals[32][7] = {
+/* Believe it or not, but some arches have more than 32 SIGs!
+ * HPPA: SIGSTKFLT == 36. */
+
+static const char signals[][7] = {
     // SUSv3 says kill must support these, and specifies the numerical values,
     // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html
-    // TODO: "[SIG]EXIT" shouldn't work for kill, right?
     // {0, "EXIT"}, {1, "HUP"}, {2, "INT"}, {3, "QUIT"},
     // {6, "ABRT"}, {9, "KILL"}, {14, "ALRM"}, {15, "TERM"}
@@ -21 +23 @@
     // {SIGCONT, "CONT"}, {SIGSTOP, "STOP"}, {SIGTSTP, "TSTP"}, {SIGTTIN, "TTIN"},
     // {SIGTTOU, "TTOU"}
+
     [0] = "EXIT",
 #ifdef SIGHUP
@@ -119 +122 @@
 // Convert signal name to number.
 
-int get_signum(const char *name)
+int FAST_FUNC get_signum(const char *name)
 {
-    int i;
+    unsigned i;
 
     i = bb_strtou(name, NULL, 10);
@@ -133 +136 @@
 
 #if ENABLE_DESKTOP && (defined(SIGIOT) || defined(SIGIO))
-    /* These are aliased to other names */
+    /* SIGIO[T] are aliased to other names,
+     * thus cannot be stored in the signals[] array.
+     * Need special code to recognize them */
     if ((name[0] | 0x20) == 'i' && (name[1] | 0x20) == 'o') {
 #ifdef SIGIO
@@ -151 +156 @@
 // Convert signal number to name
 
-const char *get_signame(int number)
+const char* FAST_FUNC get_signame(int number)
 {
     if ((unsigned)number < ARRAY_SIZE(signals)) {
@@ -160 +165 @@
     return itoa(number);
 }
+
+
+// Print the whole signal list
+
+void FAST_FUNC print_signames(void)
+{
+    unsigned signo;
+
+    for (signo = 1; signo < ARRAY_SIZE(signals); signo++) {
+        const char *name = signals[signo];
+        if (name[0])
+            puts(name);
+    }
+}