Merge branch 'busybox' into merge

4 files changed, 42 insertions, 10 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 9da8b65ee..3c1b064b6 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -11,14 +11,13 @@ choice
         prompt "Buffer allocation policy"
         default FEATURE_BUFFERS_USE_MALLOC
         help
-        There are 3 ways BusyBox can handle buffer allocations:
+        There are 3 ways busybox can handle buffer allocations:
         - Use malloc. This costs code size for the call to xmalloc.
         - Put them on stack. For some very small machines with limited stack
         space, this can be deadly. For most folks, this works just fine.
         - Put them in BSS. This works beautifully for computers with a real
         MMU (and OS support), but wastes runtime RAM for uCLinux. This
-        behavior was the only one available for BusyBox versions 0.48 and
-        earlier.
+        behavior was the only one available for versions 0.48 and earlier.
 
 config FEATURE_BUFFERS_USE_MALLOC
         bool "Allocate with Malloc"
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 172c29611..abd9e3243 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -34,6 +34,13 @@
 # include <malloc.h> /* for mallopt */
 #endif
 
+#include <sys/prctl.h>
+#ifndef PR_SET_NAME
+#define PR_SET_NAME 15
+#endif
+#ifndef PR_GET_NAME
+#define PR_GET_NAME 16
+#endif
 
 /* Declare <applet>_main() */
 #define PROTOTYPES
@@ -789,11 +796,26 @@ static void install_links(const char *busybox UNUSED_PARAM,
 }
 # endif
 
-# if ENABLE_BUSYBOX
 static void run_applet_and_exit(const char *name, char **argv) NORETURN;
 
-/* If we were called as "busybox..." */
-static int busybox_main(char **argv)
+# if ENABLE_BUSYBOX
+#  if ENABLE_FEATURE_SH_STANDALONE && ENABLE_FEATURE_TAB_COMPLETION
+    /*
+     * Insert "busybox" into applet table as well.
+     * This makes standalone shell tab-complete this name too.
+     * (Otherwise having "busybox" in applet table is not necessary,
+     * there is other code which routes "busyboxANY_SUFFIX" name
+     * to busybox_main()).
+     */
+//usage:#define busybox_trivial_usage NOUSAGE_STR
+//usage:#define busybox_full_usage ""
+//applet:IF_BUSYBOX(IF_FEATURE_SH_STANDALONE(IF_FEATURE_TAB_COMPLETION(APPLET(busybox, BB_DIR_BIN, BB_SUID_MAYBE))))
+int busybox_main(int argc, char *argv[]) MAIN_EXTERNALLY_VISIBLE;
+#  else
+#   define busybox_main(argc,argv) busybox_main(argv)
+static
+#  endif
+int busybox_main(int argc UNUSED_PARAM, char **argv)
 {
         if (!argv[1]) {
                 /* Called without arguments */
@@ -990,7 +1012,7 @@ static NORETURN void run_applet_and_exit(const char *name, char **argv)
 {
 #  if ENABLE_BUSYBOX
         if (is_prefixed_with(name, "busybox"))
-                exit(busybox_main(argv));
+                exit(busybox_main(/*unused:*/ 0, argv));
 #  endif
 #  if NUM_APPLETS > 0
         /* find_applet_by_name() search is more expensive, so goes second */
@@ -1124,6 +1146,17 @@ int main(int argc UNUSED_PARAM, char **argv)
                 }
         }
         applet_name = bb_basename(applet_name);
+
+# if defined(__linux__)
+        /* If we are a result of execv("/proc/self/exe"), fix ugly comm of "exe" */
+        if (ENABLE_FEATURE_SH_STANDALONE
+         || ENABLE_FEATURE_PREFER_APPLETS
+         || !BB_MMU
+        ) {
+                prctl(PR_SET_NAME, (long)applet_name, 0, 0, 0);
+        }
+# endif
+
         parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
         run_applet_and_exit(applet_name, argv);
 
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 670a1b194..a28b6ef98 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -834,7 +834,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         }
         pf_len = strlen(pfind);
 
-#if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
+# if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
         if (type == FIND_EXE_ONLY && !dirbuf) {
                 const char *p = applet_names;
 
@@ -845,7 +845,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 }
                 add_partial_match(pfind, "busybox", pf_len);
         }
-#endif
+# endif
 
         for (i = 0; i < npaths; i++) {
                 DIR *dir;
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index bf984a44e..b82a706d8 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -143,7 +143,7 @@ int FAST_FUNC get_signum(const char *name)
         unsigned i;
 
         i = bb_strtou(name, NULL, 10);
-        if (!errno)
+        if (!errno && i < NSIG) /* for shells, we allow 0 too */
                 return i;
         if (strncasecmp(name, "SIG", 3) == 0)
                 name += 3;