Merge branch 'busybox' into merge

7 files changed, 64 insertions, 32 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 8c46d0d1b..d2f98567e 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -794,7 +794,9 @@ static void install_links(const char *busybox UNUSED_PARAM,
 }
 # endif
 
+# if ENABLE_BUSYBOX || NUM_APPLETS > 0
 static void run_applet_and_exit(const char *name, char **argv) NORETURN;
+#endif
 
 # if NUM_SCRIPTS > 0
 static int find_script_by_name(const char *name)
@@ -815,13 +817,13 @@ 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
+#  if ENABLE_SHELL_ASH
                 exit(ash_main(-script - 1, argv));
-#elif ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH
+#  elif ENABLE_SHELL_HUSH
                 exit(hush_main(-script - 1, argv));
-#else
+#  else
                 return 1;
-#endif
+#  endif
         return 0;
 }
 
@@ -1160,7 +1162,33 @@ static NORETURN void run_applet_and_exit(const char *name, char **argv)
 }
 # endif
 
-#endif /* !defined(SINGLE_APPLET_MAIN) */
+#else /* defined(SINGLE_APPLET_MAIN) */
+
+# if NUM_SCRIPTS > 0
+/* if SINGLE_APPLET_MAIN, these two functions are simpler: */
+int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int scripted_main(int argc UNUSED_PARAM, char **argv)
+{
+#  if ENABLE_SHELL_ASH
+        int script = 0;
+        exit(ash_main(-script - 1, argv));
+#  elif ENABLE_SHELL_HUSH
+        int script = 0;
+        exit(hush_main(-script - 1, argv));
+#  else
+        return 1;
+#  endif
+}
+char* FAST_FUNC
+get_script_content(unsigned n UNUSED_PARAM)
+{
+        char *t = unpack_bz2_data(packed_scripts, sizeof(packed_scripts),
+                                        UNPACKED_SCRIPTS_LENGTH);
+        return t;
+}
+# endif /* NUM_SCRIPTS > 0 */
+
+#endif /* defined(SINGLE_APPLET_MAIN) */
 
 
 #if ENABLE_BUILD_LIBBUSYBOX
diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index 856739c41..ede5a97e3 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -158,8 +158,11 @@ int FAST_FUNC index_in_substrings(const char *strings, const char *key)
 const char* FAST_FUNC nth_string(const char *strings, int n)
 {
         while (n) {
-                n--;
-                strings += strlen(strings) + 1;
+                if (*strings++ == '\0') {
+                        if (*strings == '\0') /* reached end of strings */
+                                break;
+                        n--;
+                }
         }
         return strings;
 }
diff --git a/libbb/duration.c b/libbb/duration.c
index 5acd0dba3..22b209f4d 100644
--- a/libbb/duration.c
+++ b/libbb/duration.c
@@ -17,6 +17,7 @@
 //kbuild:lib-$(CONFIG_TIMEOUT) += duration.o
 //kbuild:lib-$(CONFIG_PING)    += duration.o
 //kbuild:lib-$(CONFIG_PING6)   += duration.o
+//kbuild:lib-$(CONFIG_WATCH)   += duration.o
 
 #include "libbb.h"
 
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index 66f2e3635..918526e6c 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -8,16 +8,17 @@
  */
 #include "libbb.h"
 
-/* Find out if the last character of a string matches the one given.
- * Don't underrun the buffer if the string length is 0.
- */
+/* Find out if the last character of a string matches the one given */
 char* FAST_FUNC last_char_is(const char *s, int c)
 {
-        if (s && *s) {
-                size_t sz = strlen(s) - 1;
-                s += sz;
-                if ( (unsigned char)*s == c)
-                        return (char*)s;
+        if (s) {
+                size_t sz = strlen(s);
+                /* Don't underrun the buffer if the string length is 0 */
+                if (sz != 0) {
+                        s += sz - 1;
+                        if ((unsigned char)*s == c)
+                                return (char*)s;
+                }
         }
         return NULL;
 }
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index f4247d237..a36a1647d 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -99,7 +99,7 @@ static bool BB_ispunct(CHAR_T c)
 # if ENABLE_FEATURE_EDITING_VI
 static bool BB_isalnum_or_underscore(CHAR_T c)
 {
-        return ((unsigned)c < 256 && isalnum(c)) || c == '_';
+        return isalnum(c) || c == '_';
 }
 # endif
 # define BB_ispunct(c) ispunct(c)
diff --git a/libbb/procps.c b/libbb/procps.c
index e6892d7ff..4f9705bc1 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -178,6 +178,15 @@ static char *skip_fields(char *str, int count)
 }
 #endif
 
+static char* skip_whitespace_if_prefixed_with(char *buf, const char *prefix)
+{
+        char *tp = is_prefixed_with(buf, prefix);
+        if (tp) {
+                tp = skip_whitespace(tp);
+        }
+        return tp;
+}
+
 #if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
 int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                 void (*cb)(struct smaprec *, void *), void *data)
@@ -208,8 +217,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                 char *tp, *p;
 
 #define SCAN(S, X) \
-                if ((tp = is_prefixed_with(buf, S)) != NULL) {       \
-                        tp = skip_whitespace(tp);                    \
+                if ((tp = skip_whitespace_if_prefixed_with(buf, S)) != NULL) { \
                         total->X += currec.X = fast_strtoul_10(&tp); \
                         continue;                                    \
                 }
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index cfe062a47..6fdc0f6a4 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -93,26 +93,17 @@ char* FAST_FUNC xstrdup(const char *s)
 // the (possibly truncated to length n) string into it.
 char* FAST_FUNC xstrndup(const char *s, int n)
 {
-        int m;
         char *t;
 
         if (ENABLE_DEBUG && s == NULL)
                 bb_simple_error_msg_and_die("xstrndup bug");
 
-        /* We can just xmalloc(n+1) and strncpy into it, */
-        /* but think about xstrndup("abc", 10000) wastage! */
-        m = n;
-        t = (char*) s;
-        while (m) {
-                if (!*t) break;
-                m--;
-                t++;
-        }
-        n -= m;
-        t = xmalloc(n + 1);
-        t[n] = '\0';
+        t = strndup(s, n);
 
-        return memcpy(t, s, n);
+        if (t == NULL)
+                bb_die_memory_exhausted();
+
+        return t;
 }
 
 void* FAST_FUNC xmemdup(const void *s, int n)