Merge branch 'busybox' into mergeFRP-3466-g53c09d0e1

20 files changed, 138 insertions, 36 deletions

diff --git a/Makefile.flags b/Makefile.flags
index ec46c4f4f..dddeb0ce6 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -15,7 +15,8 @@ CPPFLAGS += \
         -include include/autoconf.h \
         -D_GNU_SOURCE -DNDEBUG \
         $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \
-        -D"BB_VER=KBUILD_STR($(BB_VER))" -D"MINGW_VER=KBUILD_STR($(MINGW_VER))"
+        -DMINGW_VER=$(squote)$(quote)$(MINGW_VER)$(quote)$(squote) \
+        -DBB_VER=$(squote)$(quote)$(BB_VER)$(quote)$(squote)
 
 CFLAGS += $(call cc-option,-Wall,)
 CFLAGS += $(call cc-option,-Wshadow,)
diff --git a/applets_sh/mim b/applets_sh/mim
new file mode 100755
index 000000000..2a65c35bb
--- /dev/null
+++ b/applets_sh/mim
@@ -0,0 +1,39 @@
+#!/bin/sh
+MIMFILE="Mimfile"
+if [ $# -ge 2 ] && [ "$1" = "-f" ]
+then
+        MIMFILE="$2"
+        shift 2
+fi
+exec <"$MIMFILE" || exit 1
+{
+        INCASE=false
+        while read -r REPLY
+        do
+                case $REPLY in
+                *:)
+                        if ! $INCASE
+                        then
+                                printf '[ $# -eq 0 ] && set -- "%s"
+TARGET="$1"
+shift
+case "$TARGET" in
+' "${REPLY%:}"
+                        else
+                                printf ';;\n'
+                        fi
+                        printf '%s)\n' "${REPLY%:}"
+                        INCASE=true
+                        ;;
+                "") ;;
+                *) printf '%s\n' "${REPLY##[    ]}";;
+                esac
+        done
+        $INCASE && printf ';;\n'
+        printf '*)
+echo "Unknown command $TARGET"
+exit 1
+;;
+esac
+'
+} | sh -s "$@"
diff --git a/archival/unzip.c b/archival/unzip.c
index 759456c1d..67593d4ed 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -652,8 +652,14 @@ int unzip_main(int argc, char **argv)
         }
 
         /* Change dir if necessary */
-        if (base_dir)
+        if (base_dir) {
+                /* -p DIR: try to create, errors don't matter.
+                 * UnZip 6.00 does no multi-level mkdir (-p DIR1/DIR2 syntax),
+                 * not using bb_make_directory() here (yet?)
+                 */
+                mkdir(base_dir, 0777);
                 xchdir(base_dir);
+        }
 
         if (quiet <= 1) { /* not -qq */
                 if (quiet == 0) {
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index afb52b4ee..bffe88842 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.32.0.git
-# Thu May 28 10:59:26 2020
+# Fri May 29 10:58:25 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -820,6 +820,7 @@ CONFIG_FEATURE_LESS_ENV=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 CONFIG_MAN=y
 # CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 938bbcc3a..d0a541162 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.32.0.git
-# Thu May 28 10:59:26 2020
+# Fri May 29 10:59:57 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -820,6 +820,7 @@ CONFIG_FEATURE_LESS_ENV=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 CONFIG_MAN=y
 # CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
diff --git a/findutils/grep.c b/findutils/grep.c
index 5b8644c36..55e9c0a8f 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -650,6 +650,13 @@ static void load_regexes_from_file(llist_t *fopt)
         }
 }
 
+static void load_pattern_list(llist_t **lst, char *pattern)
+{
+        char *p;
+        while ((p = strsep(&pattern, "\n")) != NULL)
+                llist_add_to(lst, new_grep_list_data(p, 0));
+}
+
 static int FAST_FUNC file_action_grep(const char *filename,
                         struct stat *statbuf,
                         void* matched,
@@ -754,16 +761,19 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 #endif
         invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
 
-        {       /* convert char **argv to grep_list_data_t */
-                llist_t *cur;
+        {       /* convert char **argv to pattern_list */
+                llist_t *cur, *new = NULL;
                 for (cur = pattern_head; cur; cur = cur->link)
-                        cur->data = new_grep_list_data(cur->data, 0);
+                        load_pattern_list(&new, cur->data);
+                llist_free(pattern_head, NULL);
+                pattern_head = new;
         }
         if (option_mask32 & OPT_f) {
                 load_regexes_from_file(fopt);
                 if (!pattern_head) { /* -f EMPTY_FILE? */
-                        /* GNU grep treats it as "nothing matches" */
-                        llist_add_to(&pattern_head, new_grep_list_data((char*) "", 0));
+                        /* GNU grep treats it as "nothing matches" except when -x */
+                        const char *data = (option_mask32 & OPT_x) ? ".*" : "";
+                        llist_add_to(&pattern_head, new_grep_list_data((char*)data, 0));
                         invert_search ^= 1;
                 }
         }
@@ -805,11 +815,9 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
         /* if we didn't get a pattern from -e and no command file was specified,
          * first parameter should be the pattern. no pattern, no worky */
         if (pattern_head == NULL) {
-                char *pattern;
                 if (*argv == NULL)
                         bb_show_usage();
-                pattern = new_grep_list_data(*argv++, 0);
-                llist_add_to(&pattern_head, pattern);
+                load_pattern_list(&pattern_head, *argv++);
         }
 
         /* argv[0..(argc-1)] should be names of file to grep through. If
diff --git a/miscutils/mim.c b/miscutils/mim.c
new file mode 100644
index 000000000..d9b4694cb
--- /dev/null
+++ b/miscutils/mim.c
@@ -0,0 +1,15 @@
+//config:config MIM
+//config:       bool "mim (0.5 kb)"
+//config:       default y
+//config:       depends on FEATURE_SH_EMBEDDED_SCRIPTS
+//config:       help
+//config:       Run a script from a Makefile-like specification file.
+//config:       Unlike 'make' dependencies aren't supported.
+
+//applet:IF_MIM(APPLET_SCRIPTED(mim, scripted, BB_DIR_USR_SBIN, BB_SUID_DROP, mim))
+
+//usage:#define mim_trivial_usage
+//usage:        "[-f FILE] [SHELL_OPTIONS] [TARGET] ..."
+//usage:#define mim_full_usage "\n\n"
+//usage:        "Run a script from a Makefile-like specification file\n"
+//usage:     "\n        -f FILE         Spec file (default Mimfile)"
diff --git a/networking/httpd.c b/networking/httpd.c
index efe57ecf7..eeaa4bec1 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2878,10 +2878,16 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                 mingw_daemonize(argv);
 #endif
 
+        /* Chdir to home (unless we were re-execed for NOMMU case:
+         * we are already in the home dir then).
+         */
 #if ENABLE_PLATFORM_MINGW32
         if (!(opt & OPT_INETD))
+#else
+        if (!re_execed)
 #endif
                 xchdir(home_httpd);
+
         if (!(opt & OPT_INETD)) {
 #ifdef SIGCHLD
                 signal(SIGCHLD, SIG_IGN);
diff --git a/networking/wget.c b/networking/wget.c
index 4365c76ce..bc237c4a8 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -91,6 +91,9 @@
 //config:       patches, but do want to waste bandwidth expaining how wrong
 //config:       it is, you will be ignored.
 //config:
+//config:       FEATURE_WGET_OPENSSL does implement TLS verification
+//config:       using the certificates available to OpenSSL.
+//config:
 //config:config FEATURE_WGET_OPENSSL
 //config:       bool "Try to connect to HTTPS using openssl"
 //config:       default y
@@ -115,6 +118,9 @@
 //config:       If openssl can't be executed, internal TLS code will be used
 //config:       (if you enabled it); if openssl can be executed but fails later,
 //config:       wget can't detect this, and download will fail.
+//config:
+//config:       By default TLS verification is performed, unless
+//config:       --no-check-certificate option is passed.
 
 //applet:IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -124,8 +130,11 @@
 //usage:        IF_FEATURE_WGET_LONG_OPTIONS(
 //usage:       "[-c|--continue] [--spider] [-q|--quiet] [-O|--output-document FILE]\n"
 //usage:       "        [-o|--output-file FILE] [--header 'header: value'] [-Y|--proxy on/off]\n"
+//usage:        IF_FEATURE_WGET_OPENSSL(
+//usage:       "        [--no-check-certificate]\n"
+//usage:        )
 /* Since we ignore these opts, we don't show them in --help */
-/* //usage:    "        [--no-check-certificate] [--no-cache] [--passive-ftp] [-t TRIES]" */
+/* //usage:    "        [--no-cache] [--passive-ftp] [-t TRIES]" */
 /* //usage:    "        [-nv] [-nc] [-nH] [-np]" */
 //usage:       "        [-P DIR] [-S|--server-response] [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
 //usage:        )
@@ -137,7 +146,9 @@
 //usage:       "Retrieve files via HTTP or FTP\n"
 //usage:        IF_FEATURE_WGET_LONG_OPTIONS(
 //usage:     "\n        --spider        Only check URL existence: $? is 0 if exists"
-///////:     "\n        --no-check-certificate  Don't validate the server's certificate"
+//usage:        IF_FEATURE_WGET_OPENSSL(
+//usage:     "\n        --no-check-certificate  Don't validate the server's certificate"
+//usage:        )
 //usage:        )
 //usage:     "\n        -c              Continue retrieval of aborted transfer"
 //usage:     "\n        -q              Quiet"
@@ -668,7 +679,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         pid = xvfork();
         if (pid == 0) {
                 /* Child */
-                char *argv[8];
+                char *argv[9];
 
                 close(sp[0]);
                 xmove_fd(sp[1], 0);
@@ -695,6 +706,9 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
                         argv[5] = (char*)"-servername";
                         argv[6] = (char*)servername;
                 }
+                if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
+                        argv[7] = (char*)"-verify_return_error";
+                }
 
                 BB_EXECVP(argv[0], argv);
                 xmove_fd(3, 2);
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 6ec1809a2..5b4db5c2c 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -4,6 +4,7 @@
 # Convinient variables
 comma   := ,
 squote  := '
+quote   := "
 empty   :=
 space   := $(empty) $(empty)
 
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index f155108d7..1e3005864 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -49,7 +49,6 @@ OBJCOPY         = $(CROSS_COMPILE)objcopy
 OBJDUMP         = $(CROSS_COMPILE)objdump
 
 CFLAGS   := $(CFLAGS)
-CPPFLAGS += -D"KBUILD_STR(s)=\#s" #-Q
 
 # We need some generic definitions
 include $(srctree)/scripts/Kbuild.include
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 3e54ea712..d8d768a28 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -81,10 +81,10 @@ obj-dirs	:= $(addprefix $(obj)/,$(obj-dirs))
 # Note: It's possible that one object gets potentially linked into more
 #       than one module. In that case KBUILD_MODNAME will be set to foo_bar,
 #       where foo and bar are the name of the modules.
-name-fix = $(subst $(comma),_,$(subst -,_,$1))
-basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"
+name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote)
+basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(*F))
 modname_flags  = $(if $(filter 1,$(words $(modname))),\
-                 -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
+                 -DKBUILD_MODNAME=$(call name-fix,$(modname)))
 
 _c_flags       = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)
 _a_flags       = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
@@ -110,7 +110,7 @@ endif
 
 c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
                  $(__c_flags) $(modkern_cflags) \
-                 -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags)
+                 $(basename_flags) $(modname_flags)
 
 a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
                  $(__a_flags) $(modkern_aflags)
diff --git a/scripts/trylink b/scripts/trylink
index bb6b2de2f..6b74f092d 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -50,9 +50,6 @@ check_cc() {
     echo "int main(int argc,char**argv){return argv?argc:0;}" >"$tempname".c
     # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
     # Was using "-xc /dev/null", but we need a valid C program.
-    # "eval" may be needed if CFLAGS can contain
-    # '... -D"BB_VER=KBUILD_STR(1.N.M)" ...'
-    # and we need shell to process quotes!
     $CC $CFLAGS $LDFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1
     exitcode=$?
     rm -f "$tempname" "$tempname".c "$tempname".o
diff --git a/shell/ash.c b/shell/ash.c
index c6f64e202..27e097a99 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9251,7 +9251,6 @@ typecmd(int argc UNUSED_PARAM, char **argv)
         return err;
 }
 
-#if ENABLE_ASH_CMDCMD
 static struct strlist *
 fill_arglist(struct arglist *arglist, union node **argpp)
 {
@@ -9268,6 +9267,7 @@ fill_arglist(struct arglist *arglist, union node **argpp)
         return *lastp;
 }
 
+#if ENABLE_ASH_CMDCMD
 /* Is it "command [-p] PROG ARGS" bltin, no other opts? Return ptr to "PROG" if yes */
 static int
 parse_command_args(struct arglist *arglist, union node **argpp, const char **path)
@@ -10882,11 +10882,13 @@ evalcommand(union node *cmd, int flags)
                                 vlocal = !spclbltin;
                         }
                         cmd_is_exec = cmdentry.u.cmd == EXECCMD;
+#if ENABLE_ASH_CMDCMD
                         if (cmdentry.u.cmd != COMMANDCMD)
                                 break;
 
                         cmd_flag = parse_command_args(&arglist, &argp, &path);
                         if (!cmd_flag)
+#endif
                                 break;
                 }
 
@@ -14574,8 +14576,7 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 static int FAST_FUNC
 historycmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        if (line_input_state)
-                show_history(line_input_state);
+        show_history(line_input_state);
         return EXIT_SUCCESS;
 }
 #endif
diff --git a/shell/ash_test/ash-misc/exitcode_trap2.tests b/shell/ash_test/ash-misc/exitcode_trap2.tests
index f259774bf..aff6d5187 100755
--- a/shell/ash_test/ash-misc/exitcode_trap2.tests
+++ b/shell/ash_test/ash-misc/exitcode_trap2.tests
@@ -3,7 +3,6 @@
 $THIS_SH -c '
  trap "false;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?
diff --git a/shell/ash_test/ash-misc/exitcode_trap6.tests b/shell/ash_test/ash-misc/exitcode_trap6.tests
index 15fb99d2d..59a07fc91 100755
--- a/shell/ash_test/ash-misc/exitcode_trap6.tests
+++ b/shell/ash_test/ash-misc/exitcode_trap6.tests
@@ -5,7 +5,6 @@ $THIS_SH -c '
  trap "echo INT" int
  trap "kill -int $$;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?
diff --git a/shell/hush.c b/shell/hush.c
index 0a92f5da7..cab7ea5b0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -10461,8 +10461,7 @@ static int FAST_FUNC builtin_help(char **argv UNUSED_PARAM)
 #if MAX_HISTORY && ENABLE_FEATURE_EDITING
 static int FAST_FUNC builtin_history(char **argv UNUSED_PARAM)
 {
-        if (G.line_input_state)
-                show_history(G.line_input_state);
+        show_history(G.line_input_state);
         return EXIT_SUCCESS;
 }
 #endif
diff --git a/shell/hush_test/hush-misc/exitcode_trap2.tests b/shell/hush_test/hush-misc/exitcode_trap2.tests
index f259774bf..aff6d5187 100755
--- a/shell/hush_test/hush-misc/exitcode_trap2.tests
+++ b/shell/hush_test/hush-misc/exitcode_trap2.tests
@@ -3,7 +3,6 @@
 $THIS_SH -c '
  trap "false;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?
diff --git a/shell/hush_test/hush-misc/exitcode_trap6.tests b/shell/hush_test/hush-misc/exitcode_trap6.tests
index 15fb99d2d..59a07fc91 100755
--- a/shell/hush_test/hush-misc/exitcode_trap6.tests
+++ b/shell/hush_test/hush-misc/exitcode_trap6.tests
@@ -5,7 +5,6 @@ $THIS_SH -c '
  trap "echo INT" int
  trap "kill -int $$;exit" term
  kill $$ &
- (exit 42)
- wait
+ (sleep 1; exit 42)
 '
 echo 42:$?
diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index 26f8e69cf..e38278810 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -129,6 +129,12 @@ testing "grep -v -f EMPTY_FILE" \
         "" \
         "test\n"
 
+testing "grep -vxf EMPTY_FILE" \
+        "grep -vxf input" \
+        "test\n" \
+        "" \
+        "test\n"
+
 testing "grep -Fw matches only words" \
         "grep -Fw foo input" \
         "" \
@@ -184,6 +190,18 @@ testing "grep -x -v -e EXP1 -e EXP2 finds nothing if either EXP matches" \
         "" \
         "  aa bb cc\n"
 
+testing "grep PATTERN can be a newline-delimited list" \
+        'grep -Fv "$(printf "foo\nbar\n")"' \
+        "baz\n" \
+        "" \
+        "foo\nbar\nbaz\n"
+
+testing "grep -e PATTERN can be a newline-delimited list" \
+        'grep -Fv -e "$(printf "foo\nbar\n")"' \
+        "baz\n" \
+        "" \
+        "foo\nbar\nbaz\n"
+
 # -r on symlink to dir should recurse into dir
 mkdir -p grep.testdir/foo
 echo bar > grep.testdir/foo/file