Merge branch 'busybox' into merge

4 files changed, 152 insertions, 65 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index add609b78..3cbb5699c 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -59,6 +59,17 @@
 
 #include "usage_compressed.h"
 
+#if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS
+# define DEFINE_SCRIPT_DATA 1
+# include "embedded_scripts.h"
+#else
+# define NUM_SCRIPTS 0
+#endif
+#if NUM_SCRIPTS > 0
+# define BB_ARCHIVE_PUBLIC
+# include "bb_archive.h"
+static const char packed_scripts[] ALIGN1 = { PACKED_SCRIPTS };
+#endif
 
 /* "Do not compress usage text if uncompressed text is small
  *  and we don't include bunzip2 code for other reasons"
@@ -105,36 +116,10 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
 static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-#define BB_ARCHIVE_PUBLIC
+# define BB_ARCHIVE_PUBLIC
 # include "bb_archive.h"
-static const char *unpack_usage_messages(void)
-{
-        char *outbuf = NULL;
-        bunzip_data *bd;
-        int i;
-        jmp_buf jmpbuf;
-
-        /* Setup for I/O error handling via longjmp */
-        i = setjmp(jmpbuf);
-        if (i == 0) {
-                i = start_bunzip(&jmpbuf,
-                        &bd,
-                        /* src_fd: */ -1,
-                        /* inbuf:  */ packed_usage,
-                        /* len:    */ sizeof(packed_usage)
-                );
-        }
-        /* read_bunzip can longjmp and end up here with i != 0
-         * on read data errors! Not trivial */
-        if (i == 0) {
-                /* Cannot use xmalloc: will leak bd in NOFORK case! */
-                outbuf = malloc_or_warn(sizeof(UNPACKED_USAGE));
-                if (outbuf)
-                        read_bunzip(bd, outbuf, sizeof(UNPACKED_USAGE));
-        }
-        dealloc_bunzip(bd);
-        return outbuf;
-}
+# define unpack_usage_messages() \
+        unpack_bz2_data(packed_usage, sizeof(packed_usage), sizeof(UNPACKED_USAGE))
 # define dealloc_usage_messages(s) free(s)
 
 #else
@@ -152,21 +137,23 @@ void FAST_FUNC bb_show_usage(void)
                 /* Imagine that this applet is "true". Dont suck in printf! */
                 const char *usage_string = unpack_usage_messages();
 
-                if (*usage_string == '\b') {
-                        full_write2_str("No help available.\n\n");
-                } else {
-                        full_write2_str("Usage: "SINGLE_APPLET_STR" ");
-                        full_write2_str(usage_string);
-                        full_write2_str("\n\n");
+                if (usage_string) {
+                        if (*usage_string == '\b') {
+                                full_write2_str("No help available.\n\n");
+                        } else {
+                                full_write2_str("Usage: "SINGLE_APPLET_STR" ");
+                                full_write2_str(usage_string);
+                                full_write2_str("\n\n");
+                        }
+                        if (ENABLE_FEATURE_CLEAN_UP)
+                                dealloc_usage_messages((char*)usage_string);
                 }
-                if (ENABLE_FEATURE_CLEAN_UP)
-                        dealloc_usage_messages((char*)usage_string);
 #else
                 const char *p;
                 const char *usage_string = p = unpack_usage_messages();
                 int ap = find_applet_by_name(applet_name);
 
-                if (ap < 0) /* never happens, paranoia */
+                if (ap < 0 || usage_string == NULL)
                         xfunc_die();
                 while (ap) {
                         while (*p++) continue;
@@ -808,6 +795,50 @@ static void install_links(const char *busybox UNUSED_PARAM,
 
 static void run_applet_and_exit(const char *name, char **argv) NORETURN;
 
+# if NUM_SCRIPTS > 0
+static int find_script_by_name(const char *name)
+{
+        int i;
+        int applet = find_applet_by_name(name);
+
+        if (applet >= 0) {
+                for (i = 0; i < NUM_SCRIPTS; ++i)
+                        if (applet_numbers[i] == applet)
+                                return i;
+        }
+        return -1;
+}
+
+int scripted_main(int argc UNUSED_PARAM, char **argv)
+{
+        int script = find_script_by_name(applet_name);
+        if (script >= 0)
+#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH
+                exit(ash_main(-script - 1, argv));
+#elif ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH
+                exit(hush_main(-script - 1, argv));
+#else
+                return 1;
+#endif
+        return 0;
+}
+
+char* FAST_FUNC
+get_script_content(unsigned n)
+{
+        char *t = unpack_bz2_data(packed_scripts, sizeof(packed_scripts),
+                                        UNPACKED_SCRIPTS_LENGTH);
+        if (t) {
+                while (n != 0) {
+                        while (*t++ != '\0')
+                                continue;
+                        n--;
+                }
+        }
+        return t;
+}
+# endif /* NUM_SCRIPTS > 0 */
+
 # if ENABLE_BUSYBOX
 #  if ENABLE_FEATURE_SH_STANDALONE && ENABLE_FEATURE_TAB_COMPLETION
     /*
@@ -850,6 +881,9 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
                         "\n"
                         "Usage: busybox [function [arguments]...]\n"
                         "   or: busybox --list"IF_FULL_LIST_OPTION("[-full]")"\n"
+#  if ENABLE_FEATURE_SHOW_SCRIPT && NUM_SCRIPTS > 0
+                        "   or: busybox --show SCRIPT\n"
+#  endif
                         IF_FEATURE_INSTALLER(
                         "   or: busybox --install "IF_NOT_PLATFORM_MINGW32("[-s] ")"[DIR]\n"
                         )
@@ -877,9 +911,9 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
                         "Currently defined functions:\n"
                 );
                 col = 0;
-                a = applet_names;
                 /* prevent last comma to be in the very last pos */
                 output_width--;
+                a = applet_names;
                 while (*a) {
                         int len2 = strlen(a) + 2;
                         if (col >= (int)output_width - len2) {
@@ -900,6 +934,19 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
                 return 0;
         }
 
+#  if ENABLE_FEATURE_SHOW_SCRIPT && NUM_SCRIPTS > 0
+        if (strcmp(argv[1], "--show") == 0) {
+                int n;
+                if (!argv[2])
+                        bb_error_msg_and_die(bb_msg_requires_arg, "--show");
+                n = find_script_by_name(argv[2]);
+                if (n < 0)
+                        bb_error_msg_and_die("script '%s' not found", argv[2]);
+                full_write1_str(get_script_content(n));
+                return 0;
+        }
+#  endif
+
         if (is_prefixed_with(argv[1], "--list")) {
                 unsigned i = 0;
                 const char *a = applet_names;
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index a53a382ce..9db79ea8b 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -794,6 +794,11 @@ static const uint32_t init512_lo[] = {
 };
 #endif /* NEED_SHA512 */
 
+// Note: SHA-384 is identical to SHA-512, except that initial hash values are
+// 0xcbbb9d5dc1059ed8, 0x629a292a367cd507, 0x9159015a3070dd17, 0x152fecd8f70e5939,
+// 0x67332667ffc00b31, 0x8eb44a8768581511, 0xdb0c2e0d64f98fa7, 0x47b5481dbefa4fa4,
+// and the output is constructed by omitting last two 64-bit words of it.
+
 /* Initialize structure containing state of computation.
    (FIPS 180-2:5.3.2)  */
 void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
diff --git a/libbb/progress.c b/libbb/progress.c
index 23e974ce7..d071ce705 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -69,7 +69,7 @@ void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
  * will be "totalsize" bytes.
  * If totalsize == 0, then it is unknown.
  */
-void FAST_FUNC bb_progress_update(bb_progress_t *p,
+int FAST_FUNC bb_progress_update(bb_progress_t *p,
                 uoff_t beg_size,
                 uoff_t transferred,
                 uoff_t totalsize)
@@ -94,7 +94,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                  * Do not update on every call
                  * (we can be called on every network read!)
                  */
-                return;
+                return -1;
         }
 
         /* Before we lose real, unscaled sizes, produce human-readable size string */
@@ -211,4 +211,5 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
         }
         if (notty)
                 fputc('\n', stderr);
+        return notty;
 }
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index b3038e32d..f7d598c7a 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -12,6 +12,18 @@
 //config:       help
 //config:       Support RTMIN[+n] and RTMAX[-n] signal names
 //config:       in kill, killall etc. This costs ~250 bytes.
+//config:
+//config:config FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
+//config:       bool "Use the definitions of SIGRTMIN/SIGRTMAX provided by libc"
+//config:       default y
+//config:       depends on FEATURE_RTMINMAX
+//config:       help
+//config:       Some C libraries reserve a few real-time signals for internal
+//config:       use, and adjust the values of SIGRTMIN/SIGRTMAX seen by
+//config:       applications accordingly. Saying yes here means that a signal
+//config:       name RTMIN+n will be interpreted according to the libc definition
+//config:       of SIGRTMIN, and not the raw definition provided by the kernel.
+//config:       This behavior matches "kill -l RTMIN+n" from bash.
 
 #include "libbb.h"
 
@@ -123,7 +135,7 @@ static const char signals[][7] ALIGN1 = {
 #ifdef SIGSYS
         [SIGSYS   ] = "SYS",
 #endif
-#if ENABLE_FEATURE_RTMINMAX
+#if ENABLE_FEATURE_RTMINMAX && !ENABLE_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
 # ifdef __SIGRTMIN
         [__SIGRTMIN] = "RTMIN",
 # endif
@@ -141,8 +153,12 @@ int FAST_FUNC get_signum(const char *name)
 {
         unsigned i;
 
+        /* bb_strtou returns UINT_MAX on error. NSIG is smaller
+         * than UINT_MAX on any sane Unix. Hence no need
+         * to check errno after bb_strtou().
+         */
         i = bb_strtou(name, NULL, 10);
-        if (!errno && i < NSIG) /* for shells, we allow 0 too */
+        if (i < NSIG) /* for shells, we allow 0 too */
                 return i;
         if (strncasecmp(name, "SIG", 3) == 0)
                 name += 3;
@@ -168,36 +184,46 @@ int FAST_FUNC get_signum(const char *name)
 # 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 ENABLE_FEATURE_RTMINMAX && defined(SIGRTMIN) && defined(SIGRTMAX)
+        {
+# if ENABLE_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
+                /* Use the libc provided values. */
+                unsigned sigrtmin = SIGRTMIN;
+                unsigned sigrtmax = SIGRTMAX;
+# else
+        /* Use the "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;
+
+#  define sigrtmin __SIGRTMIN
+#  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 (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;
+                else if (strncasecmp(name, "RTMAX", 5) == 0) {
+                        if (!name[5])
+                                return sigrtmax;
+                        if (name[5] == '-') {
+                                i = bb_strtou(name + 6, NULL, 10);
+                                if (i <= sigrtmax - sigrtmin)
+                                        return sigrtmax - i;
+                        }
                 }
+# undef sigrtmin
+# undef sigrtmax
         }
-# endif
 #endif
 
         return -1;
@@ -228,8 +254,16 @@ void FAST_FUNC print_signames(void)
                         printf("%2u) %s\n", signo, name);
         }
 #if ENABLE_FEATURE_RTMINMAX
-# ifdef __SIGRTMAX
+# if ENABLE_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
+#  if defined(SIGRTMIN) && defined(SIGRTMAX)
+        printf("%2u) %s\n", SIGRTMIN, "RTMIN");
+        printf("%2u) %s\n", SIGRTMAX, "RTMAX");
+#  endif
+# else
+// __SIGRTMIN is included in signals[] array.
+#  ifdef __SIGRTMAX
         printf("%2u) %s\n", __SIGRTMAX, "RTMAX");
+#  endif
 # endif
 #endif
 }