From 3528bee569f518dcb66e1343dd808b437499db84 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 19 Oct 2016 17:19:04 +0100 Subject: Post-merge fixes Update default configurations; rename ststrdup -> sstrdup; fix status returns in evalcommand. --- configs/mingw32_defconfig | 31 ++++++++++++++++--------------- configs/mingw64_defconfig | 31 ++++++++++++++++--------------- shell/ash.c | 6 +++--- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 34ce09e78..36a39c6ad 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.26.0.git -# Thu Jul 7 14:45:07 2016 +# Wed Oct 19 17:09:41 2016 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -199,6 +199,16 @@ CONFIG_FEATURE_DD_STATUS=y # CONFIG_HOSTID is not set CONFIG_ID=y CONFIG_GROUPS=y +CONFIG_MD5SUM=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y CONFIG_SHUF=y CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y @@ -263,7 +273,6 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y # CONFIG_MKFIFO is not set @@ -283,10 +292,6 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y # CONFIG_FEATURE_FLOAT_SLEEP is not set @@ -336,11 +341,6 @@ CONFIG_FEATURE_AUTOWIDTH=y # CONFIG_FEATURE_HUMAN_READABLE=y -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - # # Console Utilities # @@ -663,6 +663,7 @@ CONFIG_HD=y # CONFIG_FEATURE_VOLUMEID_ROMFS is not set # CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_UBIFS is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set @@ -887,7 +888,6 @@ CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y # CONFIG_TRACEROUTE is not set # CONFIG_TRACEROUTE6 is not set # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set @@ -1006,6 +1006,10 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # Shells # CONFIG_ASH=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_INTERNAL_GLOB=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y CONFIG_ASH_BASH_COMPAT=y # CONFIG_ASH_IDLE_TIMEOUT is not set # CONFIG_ASH_JOB_CONTROL is not set @@ -1017,9 +1021,6 @@ CONFIG_ASH_BUILTIN_TEST=y CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y # CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index b0fb0c0d4..424ae44fa 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.26.0.git -# Thu Jul 7 14:45:07 2016 +# Wed Oct 19 17:14:18 2016 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -199,6 +199,16 @@ CONFIG_FEATURE_DD_STATUS=y # CONFIG_HOSTID is not set CONFIG_ID=y CONFIG_GROUPS=y +CONFIG_MD5SUM=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y CONFIG_SHUF=y CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y @@ -263,7 +273,6 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y # CONFIG_MKFIFO is not set @@ -283,10 +292,6 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y # CONFIG_FEATURE_FLOAT_SLEEP is not set @@ -336,11 +341,6 @@ CONFIG_FEATURE_AUTOWIDTH=y # CONFIG_FEATURE_HUMAN_READABLE=y -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - # # Console Utilities # @@ -663,6 +663,7 @@ CONFIG_HD=y # CONFIG_FEATURE_VOLUMEID_ROMFS is not set # CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_UBIFS is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set @@ -887,7 +888,6 @@ CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y # CONFIG_TRACEROUTE is not set # CONFIG_TRACEROUTE6 is not set # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set @@ -1006,6 +1006,10 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # Shells # CONFIG_ASH=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_INTERNAL_GLOB=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y CONFIG_ASH_BASH_COMPAT=y # CONFIG_ASH_IDLE_TIMEOUT is not set # CONFIG_ASH_JOB_CONTROL is not set @@ -1017,9 +1021,6 @@ CONFIG_ASH_BUILTIN_TEST=y CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y # CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set diff --git a/shell/ash.c b/shell/ash.c index 02e76c0ae..1485a35c9 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -2650,7 +2650,7 @@ updatepwd(const char *dir) int absdrive = *dir && dir[1] == ':'; int abspath = absdrive ? is_path_sep(dir[2]) : is_path_sep(*dir); - cdcomppath = ststrdup(dir); + cdcomppath = sstrdup(dir); STARTSTACKSTR(new); if (!absdrive && curdir == nullstr) return 0; @@ -10014,7 +10014,7 @@ evalcommand(union node *cmd, int flags) if (applet_no >= 0 && APPLET_IS_NOFORK(applet_no)) { listsetvar(varlist.list, VEXPORT|VSTACK); /* run _main() */ - exitstatus = run_nofork_applet(applet_no, argv); + status = run_nofork_applet(applet_no, argv); break; } #endif @@ -10036,7 +10036,7 @@ evalcommand(union node *cmd, int flags) jp = makejob(/*cmd,*/ 1); if (spawn_forkshell(jp, &fs, FORK_FG) < 0) ash_msg_and_raise_error("unable to spawn shell"); - exitstatus = waitforjob(jp); + status = waitforjob(jp); INT_ON; TRACE(("forked child exited with %d\n", exitstatus)); break; -- cgit v1.2.3-55-g6feb