Merge branch 'busybox' into merge

15 files changed, 162 insertions, 121 deletions

diff --git a/libbb/auto_string.c b/libbb/auto_string.c
new file mode 100644
index 000000000..ae940069a
--- /dev/null
+++ b/libbb/auto_string.c
@@ -0,0 +1,23 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2015 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//kbuild:lib-y += auto_string.o
+
+#include "libbb.h"
+
+char* FAST_FUNC auto_string(char *str)
+{
+        static char *saved[4];
+        static uint8_t cur_saved; /* = 0 */
+
+        free(saved[cur_saved]);
+        saved[cur_saved] = str;
+        cur_saved = (cur_saved + 1) & (ARRAY_SIZE(saved)-1);
+
+        return str;
+}
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index 1927ba9e9..c2580b9eb 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -1,7 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
  * Ask for a password
- * I use a static buffer in this function.  Plan accordingly.
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
@@ -23,8 +22,8 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
 {
         /* Was static char[BIGNUM] */
         enum { sizeof_passwd = 128 };
-        static char *passwd;
 
+        char *passwd;
         char *ret;
         int i;
         struct sigaction sa, oldsa;
@@ -62,8 +61,7 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
                 alarm(timeout);
         }
 
-        if (!passwd)
-                passwd = xmalloc(sizeof_passwd);
+        passwd = auto_string(xmalloc(sizeof_passwd));
         ret = passwd;
         i = 0;
         while (1) {
diff --git a/libbb/bbunit.c b/libbb/bbunit.c
index 4c692d59f..db67b1081 100644
--- a/libbb/bbunit.c
+++ b/libbb/bbunit.c
@@ -17,8 +17,6 @@
 
 #include "libbb.h"
 
-#define WANT_TIMING 0
-
 static llist_t *tests = NULL;
 static unsigned tests_registered = 0;
 static int test_retval;
@@ -34,57 +32,34 @@ void bbunit_settestfailed(void)
         test_retval = -1;
 }
 
-#if WANT_TIMING
-static void timeval_diff(struct timeval* res,
-                                const struct timeval* x,
-                                const struct timeval* y)
-{
-        long udiff = x->tv_usec - y->tv_usec;
-
-        res->tv_sec = x->tv_sec - y->tv_sec - (udiff < 0);
-        res->tv_usec = (udiff >= 0 ? udiff : udiff + 1000000);
-}
-#endif
-
 int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) MAIN_EXTERNALLY_VISIBLE;
 int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
         unsigned tests_run = 0;
         unsigned tests_failed = 0;
-#if WANT_TIMING
-        struct timeval begin;
-        struct timeval end;
-        struct timeval time_spent;
-        gettimeofday(&begin, NULL);
-#endif
 
         bb_error_msg("Running %d test(s)...", tests_registered);
         for (;;) {
                 struct bbunit_listelem* el = llist_pop(&tests);
                 if (!el)
                         break;
+
                 bb_error_msg("Case: [%s]", el->name);
                 test_retval = 0;
                 el->testfunc();
+
                 if (test_retval < 0) {
                         bb_error_msg("[ERROR] [%s]: TEST FAILED", el->name);
                         tests_failed++;
                 }
                 tests_run++;
-                el = el->next;
         }
 
-#if WANT_TIMING
-        gettimeofday(&end, NULL);
-        timeval_diff(&time_spent, &end, &begin);
-        bb_error_msg("Elapsed time %u.%06u seconds",
-                        (int)time_spent.tv_sec,
-                        (int)time_spent.tv_usec);
-#endif
         if (tests_failed > 0) {
                 bb_error_msg("[ERROR] %u test(s) FAILED", tests_failed);
                 return EXIT_FAILURE;
         }
+
         bb_error_msg("All tests passed");
         return EXIT_SUCCESS;
 }
diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index e24815a03..2f51237a3 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -5,6 +5,11 @@
 
 #include "libbb.h"
 
+/*
+ * Return NULL if string is not prefixed with key. Return pointer to the
+ * first character in string after the prefix key. If key is an empty string,
+ * return pointer to the beginning of string.
+ */
 char* FAST_FUNC is_prefixed_with(const char *string, const char *key)
 {
 #if 0   /* Two passes over key - probably slower */
@@ -23,6 +28,26 @@ char* FAST_FUNC is_prefixed_with(const char *string, const char *key)
 #endif
 }
 
+/*
+ * Return NULL if string is not suffixed with key. Return pointer to the
+ * beginning of prefix key in string. If key is an empty string return pointer
+ * to the end of string.
+ */
+char* FAST_FUNC is_suffixed_with(const char *string, const char *key)
+{
+        size_t key_len = strlen(key);
+        ssize_t len_diff = strlen(string) - key_len;
+
+        if (len_diff >= 0) {
+                string += len_diff;
+                if (strcmp(string, key) == 0) {
+                        return (char*)string;
+                }
+        }
+
+        return NULL;
+}
+
 /* returns the array index of the string */
 /* (index of first match is returned, or -1) */
 int FAST_FUNC index_in_str_array(const char *const string_array[], const char *key)
@@ -110,3 +135,37 @@ smallint FAST_FUNC yesno(const char *str)
         return ret / 3;
 }
 #endif
+
+#if ENABLE_UNIT_TEST
+
+BBUNIT_DEFINE_TEST(is_prefixed_with)
+{
+        BBUNIT_ASSERT_STREQ(" bar", is_prefixed_with("foo bar", "foo"));
+        BBUNIT_ASSERT_STREQ("bar", is_prefixed_with("foo bar", "foo "));
+        BBUNIT_ASSERT_STREQ("", is_prefixed_with("foo", "foo"));
+        BBUNIT_ASSERT_STREQ("foo", is_prefixed_with("foo", ""));
+        BBUNIT_ASSERT_STREQ("", is_prefixed_with("", ""));
+
+        BBUNIT_ASSERT_NULL(is_prefixed_with("foo", "bar foo"));
+        BBUNIT_ASSERT_NULL(is_prefixed_with("foo foo", "bar"));
+        BBUNIT_ASSERT_NULL(is_prefixed_with("", "foo"));
+
+        BBUNIT_ENDTEST;
+}
+
+BBUNIT_DEFINE_TEST(is_suffixed_with)
+{
+        BBUNIT_ASSERT_STREQ("bar", is_suffixed_with("foo bar", "bar"));
+        BBUNIT_ASSERT_STREQ("foo", is_suffixed_with("foo", "foo"));
+        BBUNIT_ASSERT_STREQ("", is_suffixed_with("foo", ""));
+        BBUNIT_ASSERT_STREQ("", is_suffixed_with("", ""));
+        BBUNIT_ASSERT_STREQ("foo", is_suffixed_with("barfoofoo", "foo"));
+
+        BBUNIT_ASSERT_NULL(is_suffixed_with("foo", "bar foo"));
+        BBUNIT_ASSERT_NULL(is_suffixed_with("foo foo", "bar"));
+        BBUNIT_ASSERT_NULL(is_suffixed_with("", "foo"));
+
+        BBUNIT_ENDTEST;
+}
+
+#endif /* ENABLE_UNIT_TEST */
diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c
index 9ad5dbf96..b4bed865f 100644
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -15,15 +15,10 @@
 
 void FAST_FUNC fflush_stdout_and_exit(int retval)
 {
+        xfunc_error_retval = retval;
         if (fflush(stdout))
                 bb_perror_msg_and_die(bb_msg_standard_output);
-
-        if (ENABLE_FEATURE_PREFER_APPLETS && die_sleep < 0) {
-                /* We are in NOFORK applet. Do not exit() directly,
-                 * but use xfunc_die() */
-                xfunc_error_retval = retval;
-                xfunc_die();
-        }
-
-        exit(retval);
+        /* In case we are in NOFORK applet. Do not exit() directly,
+         * but use xfunc_die() */
+        xfunc_die();
 }
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 1f63ccdee..d08c6b2f7 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -137,7 +137,7 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
 #if MD5_SMALL > 0
         /* Before we start, one word to the strange constants.
            They are defined in RFC 1321 as
-           T[i] = (int)(4294967296.0 * fabs(sin(i))), i=1..64
+           T[i] = (int)(2^32 * fabs(sin(i))), i=1..64
          */
         static const uint32_t C_array[] = {
                 /* round 1 */
@@ -213,7 +213,7 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
                 case 2:
                         temp += FH(B, C, D);
                         break;
-                case 3:
+                default: /* case 3 */
                         temp += FI(B, C, D);
                 }
                 temp += words[(int) (*pp++)] + *pc++;
@@ -277,10 +277,6 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
 
 #else  /* MD5_SMALL == 0 or 1 */
 
-        uint32_t A_save = A;
-        uint32_t B_save = B;
-        uint32_t C_save = C;
-        uint32_t D_save = D;
 # if MD5_SMALL == 1
         const uint32_t *pc;
         const char *pp;
@@ -425,10 +421,10 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
 # undef OP
 # endif
         /* Add checksum to the starting values */
-        ctx->hash[0] = A_save + A;
-        ctx->hash[1] = B_save + B;
-        ctx->hash[2] = C_save + C;
-        ctx->hash[3] = D_save + D;
+        ctx->hash[0] += A;
+        ctx->hash[1] += B;
+        ctx->hash[2] += C;
+        ctx->hash[3] += D;
 #endif
 }
 #undef FF
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index 0b2eb777e..5c7fc076f 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -37,8 +37,6 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val,
                 '\0', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'
         };
 
-        static char *str;
-
         unsigned frac; /* 0..9 - the fractional digit */
         const char *u;
         const char *fmt;
@@ -81,12 +79,7 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val,
 #endif
         }
 
-        if (!str) {
-                /* sufficient for any width of val */
-                str = xmalloc(sizeof(val)*3 + 2 + 3);
-        }
-        sprintf(str, fmt, val, frac, *u);
-        return str;
+        return auto_string(xasprintf(fmt, val, frac, *u));
 }
 
 
diff --git a/libbb/messages.c b/libbb/messages.c
index ef42b30d7..108cb0285 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -45,7 +45,7 @@ const char bb_PATH_root_path[] ALIGN1 =
         "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH;
 
 
-const int const_int_1 = 1;
+//const int const_int_1 = 1;
 /* explicitly = 0, otherwise gcc may make it a common variable
  * and it will end up in bss */
 const int const_int_0 = 0;
diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c
index 5a4e1c579..bddd39bca 100644
--- a/libbb/parse_mode.c
+++ b/libbb/parse_mode.c
@@ -15,7 +15,7 @@
 
 #define FILEMODEBITS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
 
-int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
+int FAST_FUNC bb_parse_mode(const char *s, unsigned current_mode)
 {
         static const mode_t who_mask[] = {
                 S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO, /* a */
@@ -46,13 +46,12 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
 
                 tmp = strtoul(s, &e, 8);
                 if (*e || (tmp > 07777U)) { /* Check range and trailing chars. */
-                        return 0;
+                        return -1;
                 }
-                *current_mode = tmp;
-                return 1;
+                return tmp;
         }
 
-        new_mode = *current_mode;
+        new_mode = current_mode;
 
         /* Note: we allow empty clauses, and hence empty modes.
          * We treat an empty mode as no change to perms. */
@@ -71,7 +70,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
                         if (*p == *s) {
                                 wholist |= who_mask[(int)(p-who_chars)];
                                 if (!*++s) {
-                                        return 0;
+                                        return -1;
                                 }
                                 goto WHO_LIST;
                         }
@@ -80,7 +79,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
                 do {    /* Process action list. */
                         if ((*s != '+') && (*s != '-')) {
                                 if (*s != '=') {
-                                        return 0;
+                                        return -1;
                                 }
                                 /* Since op is '=', clear all bits corresponding to the
                                  * wholist, or all file bits if wholist is empty. */
@@ -145,6 +144,5 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
                 } while (*s && (*s != ','));
         }
 
-        *current_mode = new_mode;
-        return 1;
+        return new_mode;
 }
diff --git a/libbb/printable_string.c b/libbb/printable_string.c
index 3e768d0b9..e638a178e 100644
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -11,9 +11,6 @@
 
 const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
 {
-        static char *saved[4];
-        static unsigned cur_saved; /* = 0 */
-
         char *dst;
         const char *s;
 
@@ -56,10 +53,5 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
                 }
         }
 #endif
-
-        free(saved[cur_saved]);
-        saved[cur_saved] = dst;
-        cur_saved = (cur_saved + 1) & (ARRAY_SIZE(saved)-1);
-
-        return dst;
+        return auto_string(dst);
 }
diff --git a/libbb/procps.c b/libbb/procps.c
index 32dae43e3..5a4ea59d0 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -284,7 +284,6 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
 }
 #endif
 
-void BUG_comm_size(void);
 procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
 {
         if (!sp)
@@ -386,8 +385,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                         /*if (!cp || cp[1] != ' ')
                                 continue;*/
                         cp[0] = '\0';
-                        if (sizeof(sp->comm) < 16)
-                                BUG_comm_size();
+                        BUILD_BUG_ON(sizeof(sp->comm) < 16);
                         comm1 = strchr(buf, '(');
                         /*if (comm1)*/
                                 safe_strncpy(sp->comm, comm1 + 1, sizeof(sp->comm));
diff --git a/libbb/udp_io.c b/libbb/udp_io.c
index 7985a9723..a32af9bd2 100644
--- a/libbb/udp_io.c
+++ b/libbb/udp_io.c
@@ -16,10 +16,10 @@ void FAST_FUNC
 socket_want_pktinfo(int fd UNUSED_PARAM)
 {
 #ifdef IP_PKTINFO
-        setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &const_int_1, sizeof(int));
+        setsockopt_1(fd, IPPROTO_IP, IP_PKTINFO);
 #endif
 #if ENABLE_FEATURE_IPV6 && defined(IPV6_PKTINFO)
-        setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, &const_int_1, sizeof(int));
+        setsockopt_1(fd, IPPROTO_IPV6, IPV6_PKTINFO);
 #endif
 }
 
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index de4d14fce..2d3204507 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -71,28 +71,44 @@ pid_t FAST_FUNC xspawn(char **argv)
 }
 
 #if ENABLE_FEATURE_PREFER_APPLETS
+static jmp_buf die_jmp;
+static void jump(void)
+{
+        /* Special case. We arrive here if NOFORK applet
+         * calls xfunc, which then decides to die.
+         * We don't die, but jump instead back to caller.
+         * NOFORK applets still cannot carelessly call xfuncs:
+         * p = xmalloc(10);
+         * q = xmalloc(10); // BUG! if this dies, we leak p!
+         */
+        /* | 0x100 allows to pass zero exitcode (longjmp can't pass 0).
+         * This works because exitcodes are bytes,
+         * run_nofork_applet() ensures that by "& 0xff" */
+        longjmp(die_jmp, xfunc_error_retval | 0x100);
+}
+
 struct nofork_save_area {
         jmp_buf die_jmp;
+        void (*die_func)(void);
         const char *applet_name;
         uint32_t option_mask32;
-        int die_sleep;
         uint8_t xfunc_error_retval;
 };
 static void save_nofork_data(struct nofork_save_area *save)
 {
         memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp));
+        save->die_func = die_func;
         save->applet_name = applet_name;
-        save->xfunc_error_retval = xfunc_error_retval;
         save->option_mask32 = option_mask32;
-        save->die_sleep = die_sleep;
+        save->xfunc_error_retval = xfunc_error_retval;
 }
 static void restore_nofork_data(struct nofork_save_area *save)
 {
         memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp));
+        die_func = save->die_func;
         applet_name = save->applet_name;
-        xfunc_error_retval = save->xfunc_error_retval;
         option_mask32 = save->option_mask32;
-        die_sleep = save->die_sleep;
+        xfunc_error_retval = save->xfunc_error_retval;
 }
 
 int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
@@ -135,11 +151,8 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
         while (argv[argc])
                 argc++;
 
-        /* Special flag for xfunc_die(). If xfunc will "die"
-         * in NOFORK applet, xfunc_die() sees negative
-         * die_sleep and longjmp here instead. */
-        die_sleep = -1;
-
+        /* If xfunc "dies" in NOFORK applet, die_func longjmp's here instead */
+        die_func = jump;
         rc = setjmp(die_jmp);
         if (!rc) {
                 /* Some callers (xargs)
@@ -148,10 +161,8 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
                 memcpy(tmp_argv, argv, (argc+1) * sizeof(tmp_argv[0]));
                 /* Finally we can call NOFORK applet's main() */
                 rc = applet_main[applet_no](argc, tmp_argv);
-        } else { /* xfunc died in NOFORK applet */
-                /* in case they meant to return 0... */
-                if (rc == -2222)
-                        rc = 0;
+        } else {
+                /* xfunc died in NOFORK applet */
         }
 
         /* Restoring some globals */
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 442482a8b..0a4d8f128 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -14,13 +14,34 @@
 #include <sys/un.h>
 #include "libbb.h"
 
+int FAST_FUNC setsockopt_int(int fd, int level, int optname, int optval)
+{
+        return setsockopt(fd, level, optname, &optval, sizeof(int));
+}
+int FAST_FUNC setsockopt_1(int fd, int level, int optname)
+{
+        return setsockopt_int(fd, level, optname, 1);
+}
+int FAST_FUNC setsockopt_SOL_SOCKET_int(int fd, int optname, int optval)
+{
+        return setsockopt_int(fd, SOL_SOCKET, optname, optval);
+}
+int FAST_FUNC setsockopt_SOL_SOCKET_1(int fd, int optname)
+{
+        return setsockopt_SOL_SOCKET_int(fd, optname, 1);
+}
+
 void FAST_FUNC setsockopt_reuseaddr(int fd)
 {
-        setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &const_int_1, sizeof(const_int_1));
+        setsockopt_SOL_SOCKET_1(fd, SO_REUSEADDR);
 }
 int FAST_FUNC setsockopt_broadcast(int fd)
 {
-        return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_1, sizeof(const_int_1));
+        return setsockopt_SOL_SOCKET_1(fd, SO_BROADCAST);
+}
+int FAST_FUNC setsockopt_keepalive(int fd)
+{
+        return setsockopt_SOL_SOCKET_1(fd, SO_KEEPALIVE);
 }
 
 #ifdef SO_BINDTODEVICE
diff --git a/libbb/xfunc_die.c b/libbb/xfunc_die.c
index 204e5e49d..73f7998e5 100644
--- a/libbb/xfunc_die.c
+++ b/libbb/xfunc_die.c
@@ -7,34 +7,16 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-/* Keeping it separate allows to NOT suck in stdio for VERY small applets.
+/* Keeping it separate allows to NOT pull in stdio for VERY small applets.
  * Try building busybox with only "true" enabled... */
 
 #include "libbb.h"
 
-int die_sleep;
-#if ENABLE_FEATURE_PREFER_APPLETS || ENABLE_HUSH
-jmp_buf die_jmp;
-#endif
+void (*die_func)(void);
 
 void FAST_FUNC xfunc_die(void)
 {
-        if (die_sleep) {
-                if ((ENABLE_FEATURE_PREFER_APPLETS || ENABLE_HUSH)
-                 && die_sleep < 0
-                ) {
-                        /* Special case. We arrive here if NOFORK applet
-                         * calls xfunc, which then decides to die.
-                         * We don't die, but jump instead back to caller.
-                         * NOFORK applets still cannot carelessly call xfuncs:
-                         * p = xmalloc(10);
-                         * q = xmalloc(10); // BUG! if this dies, we leak p!
-                         */
-                        /* -2222 means "zero" (longjmp can't pass 0)
-                         * run_nofork_applet() catches -2222. */
-                        longjmp(die_jmp, xfunc_error_retval ? xfunc_error_retval : -2222);
-                }
-                sleep(die_sleep);
-        }
+        if (die_func)
+                die_func();
         exit(xfunc_error_retval);
 }