Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/u_signal_names.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/u_signal_names.c (modified) (4 diffs)

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

@@ -7 +7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//config:config FEATURE_RTMINMAX
+//config:   bool "Support RTMIN[+n] and RTMAX[-n] signal names"
+//config:   default y
+//config:   help
+//config:     Support RTMIN[+n] and RTMAX[-n] signal names
+//config:     in kill, killall etc. This costs ~250 bytes.
 
 #include "libbb.h"
@@ -118 +125 @@
     [SIGSYS   ] = "SYS",
 #endif
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMIN
+    [__SIGRTMIN] = "RTMIN",
+# endif
+// This makes array about x2 bigger.
+// More compact approach is to special-case SIGRTMAX in print_signames()
+//# ifdef __SIGRTMAX
+//  [__SIGRTMAX] = "RTMAX",
+//# endif
+#endif
 };
 
@@ -135 +152 @@
             return i;
 
-#if ENABLE_DESKTOP && (defined(SIGIOT) || defined(SIGIO))
+#if ENABLE_DESKTOP
+# if defined(SIGIOT) || defined(SIGIO)
     /* 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
+#  ifdef SIGIO
         if (!name[2])
             return SIGIO;
-#endif
-#ifdef SIGIOT
+#  endif
+#  ifdef SIGIOT
         if ((name[2] | 0x20) == 't' && !name[3])
             return SIGIOT;
-#endif
-    }
+#  endif
+    }
+# endif
+#endif
+
+#if ENABLE_FEATURE_RTMINMAX
+# if defined(SIGRTMIN) && defined(SIGRTMAX)
+/* libc may use some rt sigs for pthreads and therefore "remap" SIGRTMIN/MAX,
+ * but we want to use "raw" SIGRTMIN/MAX. Underscored names, if exist, provide
+ * them. If they don't exist, fall back to non-underscored ones: */
+#  if !defined(__SIGRTMIN)
+#   define __SIGRTMIN SIGRTMIN
+#  endif
+#  if !defined(__SIGRTMAX)
+#   define __SIGRTMAX SIGRTMAX
+#  endif
+    if (strncasecmp(name, "RTMIN", 5) == 0) {
+        if (!name[5])
+            return __SIGRTMIN;
+        if (name[5] == '+') {
+            i = bb_strtou(name + 6, NULL, 10);
+            if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                return __SIGRTMIN + i;
+        }
+    }
+    else if (strncasecmp(name, "RTMAX", 5) == 0) {
+        if (!name[5])
+            return __SIGRTMAX;
+        if (name[5] == '-') {
+            i = bb_strtou(name + 6, NULL, 10);
+            if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                return __SIGRTMAX - i;
+        }
+    }
+# endif
 #endif
 
@@ -176 +227 @@
         const char *name = signals[signo];
         if (name[0])
-            puts(name);
-    }
+            printf("%2u) %s\n", signo, name);
+    }
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMAX
+    printf("%2u) %s\n", __SIGRTMAX, "RTMAX");
+# endif
+#endif
 }