Merge branch 'busybox' into merge

3 files changed, 153 insertions, 87 deletions

diff --git a/shell/ash.c b/shell/ash.c
index b82c51029..690485a83 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -416,10 +416,18 @@ static const char *const optletters_optnames[] = {
         "e"   "errexit",
         "f"   "noglob",
         "I"   "ignoreeof",
-        "i"   "interactive",
+/* The below allowed this invocation:
+ * ash -c 'set -i; echo $-; sleep 5; echo $-'
+ * to be ^C-ed and get to interactive ash prompt.
+ * bash does not support such "set -i".
+ * In our code, this is denoted by empty long name:
+ */
+        "i"   "",
         "m"   "monitor",
         "n"   "noexec",
-        "s"   "stdin",
+/* Ditto: bash has no "set -s" */
+        "s"   "",
+        "c"   "",
         "x"   "xtrace",
         "v"   "verbose",
         "C"   "noclobber",
@@ -444,6 +452,20 @@ static const char *const optletters_optnames[] = {
         ,"\0"  "nocaseglob"
 #endif
 };
+//bash 4.4.23 also has these opts (with these defaults):
+//braceexpand           on
+//emacs                 on
+//errtrace              off
+//functrace             off
+//hashall               on
+//histexpand            off
+//history               on
+//interactive-comments  on
+//keyword               off
+//onecmd                off
+//physical              off
+//posix                 off
+//privileged            off
 
 #define optletters(n)  optletters_optnames[n][0]
 #define optnames(n)   (optletters_optnames[n] + 1)
@@ -517,21 +539,22 @@ struct globals_misc {
 #define mflag optlist[4]
 #define nflag optlist[5]
 #define sflag optlist[6]
-#define xflag optlist[7]
-#define vflag optlist[8]
-#define Cflag optlist[9]
-#define aflag optlist[10]
-#define bflag optlist[11]
-#define uflag optlist[12]
-#define viflag optlist[13]
+#define cflag optlist[7]
+#define xflag optlist[8]
+#define vflag optlist[9]
+#define Cflag optlist[10]
+#define aflag optlist[11]
+#define bflag optlist[12]
+#define uflag optlist[13]
+#define viflag optlist[14]
 #if BASH_PIPEFAIL
-# define pipefail optlist[14]
+# define pipefail optlist[15]
 #else
 # define pipefail 0
 #endif
 #if DEBUG
-# define nolog optlist[14 + BASH_PIPEFAIL]
-# define debug optlist[15 + BASH_PIPEFAIL]
+# define nolog optlist[15 + BASH_PIPEFAIL]
+# define debug optlist[16 + BASH_PIPEFAIL]
 #endif
 #if ENABLE_PLATFORM_MINGW32
 # define winxp optlist[14 + BASH_PIPEFAIL + 2*DEBUG]
@@ -10156,8 +10179,8 @@ setinteractive(int on)
         setsignal(SIGINT);
         setsignal(SIGQUIT);
         setsignal(SIGTERM);
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
         if (is_interactive > 1) {
+#if !ENABLE_FEATURE_SH_EXTRA_QUIET
                 /* Looks like they want an interactive shell */
                 static smallint did_banner;
 
@@ -10171,8 +10194,12 @@ setinteractive(int on)
                         );
                         did_banner = 1;
                 }
-        }
 #endif
+#if ENABLE_FEATURE_EDITING
+                if (!line_input_state)
+                        line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
+#endif
+        }
 }
 
 static void
@@ -10184,10 +10211,12 @@ optschanged(void)
         setinteractive(iflag);
         setjobctl(mflag);
 #if ENABLE_FEATURE_EDITING_VI
-        if (viflag)
-                line_input_state->flags |= VI_MODE;
-        else
-                line_input_state->flags &= ~VI_MODE;
+        if (line_input_state) {
+                if (viflag)
+                        line_input_state->flags |= VI_MODE;
+                else
+                        line_input_state->flags &= ~VI_MODE;
+        }
 #else
         viflag = 0; /* forcibly keep the option off */
 #endif
@@ -11203,13 +11232,11 @@ preadfd(void)
         else {
 # if ENABLE_ASH_IDLE_TIMEOUT
                 int timeout = -1;
-                if (iflag) {
-                        const char *tmout_var = lookupvar("TMOUT");
-                        if (tmout_var) {
-                                timeout = atoi(tmout_var) * 1000;
-                                if (timeout <= 0)
-                                        timeout = -1;
-                        }
+                const char *tmout_var = lookupvar("TMOUT");
+                if (tmout_var) {
+                        timeout = atoi(tmout_var) * 1000;
+                        if (timeout <= 0)
+                                timeout = -1;
                 }
                 line_input_state->timeout = timeout;
 # endif
@@ -11750,6 +11777,8 @@ plus_minus_o(char *name, int val)
                 return 1;
         }
         for (i = 0; i < NOPTS; i++) {
+                if (optnames(i)[0] == '\0')
+                        continue;
                 if (val) {
                         out1fmt("%-16s%s\n", optnames(i), optlist[i] ? "on" : "off");
                 } else {
@@ -11764,7 +11793,7 @@ setoption(int flag, int val)
         int i;
 
         for (i = 0; i < NOPTS; i++) {
-                if (optletters(i) == flag) {
+                if (optletters(i) == flag && optnames(i)[0] != '\0') {
                         optlist[i] = val;
                         return;
                 }
@@ -11772,14 +11801,17 @@ setoption(int flag, int val)
         ash_msg_and_raise_error("illegal option %c%c", val ? '-' : '+', flag);
         /* NOTREACHED */
 }
+/* If login_sh is not NULL, we are called to parse command line opts,
+ * not "set -opts"
+ */
 static int
-options(int cmdline, int *login_sh)
+options(int *login_sh)
 {
         char *p;
         int val;
         int c;
 
-        if (cmdline) {
+        if (login_sh) {
                 minusc = NULL;
 #if ENABLE_PLATFORM_MINGW32
                 dirarg = NULL;
@@ -11795,7 +11827,7 @@ options(int cmdline, int *login_sh)
                 if (c == '-') {
                         val = 1;
                         if (p[0] == '\0' || LONE_DASH(p)) {
-                                if (!cmdline) {
+                                if (!login_sh) {
                                         /* "-" means turn off -x and -v */
                                         if (p[0] == '\0')
                                                 xflag = vflag = 0;
@@ -11808,40 +11840,58 @@ options(int cmdline, int *login_sh)
                 }
                 /* first char was + or - */
                 while ((c = *p++) != '\0') {
-                        /* bash 3.2 indeed handles -c CMD and +c CMD the same */
-                        if (c == 'c' && cmdline) {
-                                minusc = p;     /* command is after shell args */
+                        if (login_sh) {
+                                /* bash 3.2 indeed handles -c CMD and +c CMD the same */
+                                if (c == 'c') {
+                                        minusc = p; /* command is after shell args */
+                                        cflag = 1;
+                                        continue;
+                                }
 #if ENABLE_PLATFORM_MINGW32
-                        /* Undocumented flags;
-                         *   -d force current directory
-                         *   -t title to display in console window
-                         * Must appear before -s or -c. */
-                        } else if (c == 'd' && cmdline && val == 1) {
-                                if (*argptr == NULL)
-                                        ash_msg_and_raise_error(bb_msg_requires_arg, "-d");
-                                dirarg = *argptr++;
-                        } else if (c == 't' && cmdline && val == 1) {
-                                if (*argptr == NULL)
-                                        ash_msg_and_raise_error(bb_msg_requires_arg, "-t");
-                                title = *argptr++;
-#endif
-                        } else if (c == 'o') {
+                                /* Undocumented flags;
+                                 *   -d force current directory
+                                 *   -t title to display in console window
+                                 * Must appear before -s or -c. */
+                                if (c == 'd' && val == 1) {
+                                        if (*argptr == NULL)
+                                                ash_msg_and_raise_error(bb_msg_requires_arg, "-d");
+                                        dirarg = *argptr++;
+                                        continue;
+                                }
+                                if (c == 't' && val == 1) {
+                                        if (*argptr == NULL)
+                                                ash_msg_and_raise_error(bb_msg_requires_arg, "-t");
+                                        title = *argptr++;
+                                        continue;
+                                }
+#endif
+                                if (c == 's') { /* -s, +s */
+                                        sflag = 1;
+                                        continue;
+                                }
+                                if (c == 'i') { /* -i, +i */
+                                        iflag = 1;
+                                        continue;
+                                }
+                                if (c == 'l') {
+                                        *login_sh = 1; /* -l or +l == --login */
+                                        continue;
+                                }
+                                /* bash does not accept +-login, we also won't */
+                                if (val && (c == '-')) { /* long options */
+                                        if (strcmp(p, "login") == 0) {
+                                                *login_sh = 1;
+                                        }
+                                        break;
+                                }
+                        }
+                        if (c == 'o') {
                                 if (plus_minus_o(*argptr, val)) {
                                         /* it already printed err message */
                                         return 1; /* error */
                                 }
                                 if (*argptr)
                                         argptr++;
-                        } else if (cmdline && (c == 'l')) { /* -l or +l == --login */
-                                if (login_sh)
-                                        *login_sh = 1;
-                        /* bash does not accept +-login, we also won't */
-                        } else if (cmdline && val && (c == '-')) { /* long options */
-                                if (strcmp(p, "login") == 0) {
-                                        if (login_sh)
-                                                *login_sh = 1;
-                                }
-                                break;
                         } else {
                                 setoption(c, val);
                         }
@@ -11932,7 +11982,7 @@ setcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 return showvars(nullstr, 0, VUNSET);
 
         INT_OFF;
-        retval = options(/*cmdline:*/ 0, NULL);
+        retval = options(/*login_sh:*/ NULL);
         if (retval == 0) { /* if no parse error... */
                 optschanged();
                 if (*argptr != NULL) {
@@ -13787,6 +13837,8 @@ expandstr(const char *ps, int syntax_type)
         if (setjmp(jmploc.loc) == 0) {
                 exception_handler = &jmploc;
                 expandarg(&n, NULL, EXP_QUOTED);
+        } else if (exception_type == EXEXIT) {
+                exitshell();
         }
         exception_handler = savehandler;
         RESTORE_INT(saveint);
@@ -14400,7 +14452,8 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 static int FAST_FUNC
 historycmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        show_history(line_input_state);
+        if (line_input_state)
+                show_history(line_input_state);
         return EXIT_SUCCESS;
 }
 #endif
@@ -14719,7 +14772,8 @@ exitshell(void)
         int status;
 
 #if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
-        save_history(line_input_state);
+        if (line_input_state)
+                save_history(line_input_state);
 #endif
         status = exitstatus;
         TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
@@ -14923,7 +14977,7 @@ procargs(char **argv)
         argptr = xargv;
         for (i = 0; i < NOPTS; i++)
                 optlist[i] = 2;
-        if (options(/*cmdline:*/ 1, &login_sh)) {
+        if (options(&login_sh)) {
                 /* it already printed err message */
                 raise_exception(EXERROR);
         }
@@ -14934,8 +14988,13 @@ procargs(char **argv)
                         ash_msg_and_raise_error(bb_msg_requires_arg, "-c");
                 sflag = 1;
         }
-        if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1))
+        if (iflag == 2 /* no explicit -i given */
+         && sflag == 1 /* -s given (or implied) */
+         && !minusc /* bash compat: ash -sc 'echo $-' is not interactive (dash is) */
+         && isatty(0) && isatty(1) /* we are on tty */
+        ) {
                 iflag = 1;
+        }
         if (mflag == 2)
                 mflag = iflag;
         for (i = 0; i < NOPTS; i++)
@@ -15055,9 +15114,6 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
         monitor(4, etext, profile_buf, sizeof(profile_buf), 50);
 #endif
 
-#if ENABLE_FEATURE_EDITING
-        line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
-#endif
         state = 0;
         if (setjmp(jmploc.loc)) {
                 smallint e;
@@ -15188,10 +15244,17 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                  * Ensure we don't falsely claim that 0 (stdin)
                  * is one of stacked source fds.
                  * Testcase: ash -c 'exec 1>&0' must not complain. */
+
                 // if (!sflag) g_parsefile->pf_fd = -1;
                 // ^^ not necessary since now we special-case fd 0
                 // in save_fd_on_redirect()
-                evalstring(minusc, sflag ? 0 : EV_EXIT);
+
+                // dash: evalstring(minusc, sflag ? 0 : EV_EXIT);
+                // The above makes
+                //  ash -sc 'echo $-'
+                // continue reading input from stdin after running 'echo'.
+                // bash does not do this: it prints "hBcs" and exits.
+                evalstring(minusc, EV_EXIT);
         }
 
         if (sflag || minusc == NULL) {
diff --git a/shell/hush.c b/shell/hush.c
index 4b08232a4..19b97e2a5 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -903,6 +903,7 @@ struct globals {
 # define G_x_mode 0
 #endif
         char opt_s;
+        char opt_c;
 #if ENABLE_HUSH_INTERACTIVE
         smallint promptmode; /* 0: PS1, 1: PS2 */
 #endif
@@ -1009,7 +1010,7 @@ struct globals {
         int debug_indent;
 #endif
         struct sigaction sa;
-        char optstring_buf[sizeof("eixs")];
+        char optstring_buf[sizeof("eixcs")];
 #if BASH_EPOCH_VARS
         char epoch_buf[sizeof("%lu.nnnnnn") + sizeof(long)*3];
 #endif
@@ -1397,7 +1398,7 @@ static void syntax_error(unsigned lineno UNUSED_PARAM, const char *msg)
         if (msg)
                 bb_error_msg("syntax error: %s", msg);
         else
-                bb_error_msg("syntax error");
+                bb_simple_error_msg("syntax error");
         die_if_script();
 }
 
@@ -1636,7 +1637,7 @@ static int refill_HFILE_and_getc(HFILE *fp)
         fp->cur = fp->buf;
         n = safe_read(fp->fd, fp->buf, sizeof(fp->buf));
         if (n < 0) {
-                bb_perror_msg("read error");
+                bb_simple_perror_msg("read error");
                 n = 0;
         }
         fp->end = fp->buf + n;
@@ -2281,7 +2282,7 @@ static int set_local_var(char *str, unsigned flags)
 
         eq_sign = strchr(str, '=');
         if (HUSH_DEBUG && !eq_sign)
-                bb_error_msg_and_die("BUG in setvar");
+                bb_simple_error_msg_and_die("BUG in setvar");
 
         name_len = eq_sign - str + 1; /* including '=' */
         cur_pp = &G.top_var;
@@ -2504,7 +2505,7 @@ static void set_vars_and_save_old(char **strings)
 
                 eq = strchr(*s, '=');
                 if (HUSH_DEBUG && !eq)
-                        bb_error_msg_and_die("BUG in varexp4");
+                        bb_simple_error_msg_and_die("BUG in varexp4");
                 var_pp = get_ptr_to_local_var(*s, eq - *s);
                 if (var_pp) {
                         var_p = *var_pp;
@@ -4245,7 +4246,7 @@ static int parse_redir_right_fd(o_string *as_string, struct in_str *input)
 
 //TODO: this is the place to catch ">&file" bashism (redirect both fd 1 and 2)
 
-        bb_error_msg("ambiguous redirect");
+        bb_simple_error_msg("ambiguous redirect");
         return REDIRFD_SYNTAX_ERR;
 }
 
@@ -6414,9 +6415,10 @@ static NOINLINE int expand_one_var(o_string *output, int n,
                          * commands read but are not executed,
                          * so $- can not execute too, 'n' is never seen in $-.
                          */
+                        if (G.opt_c)
+                                *cp++ = 'c';
                         if (G.opt_s)
                                 *cp++ = 's';
-//TODO: show 'c' if executed via "hush -c 'CMDS'" (bash only, not ash)
                         *cp = '\0';
                         break;
                 }
@@ -6954,7 +6956,7 @@ static char *expand_string_to_string(const char *str, int EXP_flags, int do_unba
         } else {
                 if (HUSH_DEBUG)
                         if (list[1])
-                                bb_error_msg_and_die("BUG in varexp2");
+                                bb_simple_error_msg_and_die("BUG in varexp2");
                 /* actually, just move string 2*sizeof(char*) bytes back */
                 overlapping_strcpy((char*)list, list[0]);
                 if (do_unbackslash)
@@ -7215,7 +7217,7 @@ static void re_execute_shell(char ***to_free, const char *s,
         if (argv[0][0] == '/')
                 execve(argv[0], argv, pp);
         xfunc_error_retval = 127;
-        bb_error_msg_and_die("can't re-execute the shell");
+        bb_simple_error_msg_and_die("can't re-execute the shell");
 }
 #endif  /* !BB_MMU */
 
@@ -7917,7 +7919,7 @@ static void leave_var_nest_level(void)
         G.var_nest_level--;
         debug_printf_env("var_nest_level-- %u\n", G.var_nest_level);
         if (HUSH_DEBUG && (int)G.var_nest_level < 0)
-                bb_error_msg_and_die("BUG: nesting underflow");
+                bb_simple_error_msg_and_die("BUG: nesting underflow");
 
         remove_nested_vars();
 }
@@ -8774,7 +8776,7 @@ static int checkjobs(struct pipe *fg_pipe, pid_t waitfor_pid)
                 childpid = waitpid(-1, &status, attributes);
                 if (childpid <= 0) {
                         if (childpid && errno != ECHILD)
-                                bb_perror_msg("waitpid");
+                                bb_simple_perror_msg("waitpid");
 #if ENABLE_HUSH_FAST
                         else { /* Until next SIGCHLD, waitpid's are useless */
                                 G.we_have_children = (childpid == 0);
@@ -9306,7 +9308,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
                 argv_expanded = NULL;
                 if (command->pid < 0) { /* [v]fork failed */
                         /* Clearly indicate, was it fork or vfork */
-                        bb_perror_msg(BB_MMU ? "vfork"+1 : "vfork");
+                        bb_simple_perror_msg(BB_MMU ? "vfork"+1 : "vfork");
                 } else {
                         pi->alive_cmds++;
 #if ENABLE_HUSH_JOB
@@ -9859,7 +9861,6 @@ int hush_main(int argc, char **argv)
 {
         enum {
                 OPT_login = (1 << 0),
-                OPT_s     = (1 << 1),
         };
         unsigned flags;
         unsigned builtin_argc;
@@ -10029,6 +10030,7 @@ int hush_main(int argc, char **argv)
                                 }
                                 goto final_return;
                         }
+                        G.opt_c = 1;
                         if (!G.global_argv[0]) {
                                 /* -c 'script' (no params): prevent empty $0 */
                                 G.global_argv--; /* points to argv[i] of 'script' */
@@ -10044,7 +10046,7 @@ int hush_main(int argc, char **argv)
                         /* G_interactive_fd++; */
                         break;
                 case 's':
-                        flags |= OPT_s;
+                        G.opt_s = 1;
                         break;
                 case 'l':
                         flags |= OPT_login;
@@ -10154,7 +10156,7 @@ int hush_main(int argc, char **argv)
         }
 
         /* -s is: hush -s ARGV1 ARGV2 (no SCRIPT) */
-        if (!(flags & OPT_s) && G.global_argv[1]) {
+        if (!G.opt_s && G.global_argv[1]) {
                 HFILE *input;
                 /*
                  * "bash <script>" (which is never interactive (unless -i?))
@@ -10178,6 +10180,7 @@ int hush_main(int argc, char **argv)
 #endif
                 goto final_return;
         }
+        /* "implicit" -s: bare interactive hush shows 's' in $- */
         G.opt_s = 1;
 
         /* Up to here, shell was non-interactive. Now it may become one.
@@ -10614,7 +10617,7 @@ static int FAST_FUNC builtin_read(char **argv)
         }
 
         if ((uintptr_t)r > 1) {
-                bb_error_msg("%s", r);
+                bb_simple_error_msg(r);
                 r = (char*)(uintptr_t)1;
         }
 
@@ -10859,7 +10862,7 @@ static int FAST_FUNC builtin_unset(char **argv)
         if (opts == (unsigned)-1)
                 return EXIT_FAILURE;
         if (opts == 3) {
-                bb_error_msg("unset: -v and -f are exclusive");
+                bb_simple_error_msg("unset: -v and -f are exclusive");
                 return EXIT_FAILURE;
         }
         argv += optind;
@@ -11022,7 +11025,7 @@ Test that VAR is a valid variable name?
 
         optstring = *++argv;
         if (!optstring || !(var = *++argv)) {
-                bb_error_msg("usage: getopts OPTSTRING VAR [ARGS]");
+                bb_simple_error_msg("usage: getopts OPTSTRING VAR [ARGS]");
                 return EXIT_FAILURE;
         }
 
@@ -11251,7 +11254,7 @@ static int FAST_FUNC builtin_trap(char **argv)
         }
 
         if (!argv[1]) { /* no second arg */
-                bb_error_msg("trap: invalid arguments");
+                bb_simple_error_msg("trap: invalid arguments");
                 return EXIT_FAILURE;
         }
 
@@ -11292,7 +11295,7 @@ static struct pipe *parse_jobspec(const char *str)
                 /* It is "%%", "%+" or "%" - current job */
                 jobnum = G.last_jobid;
                 if (jobnum == 0) {
-                        bb_error_msg("no current job");
+                        bb_simple_error_msg("no current job");
                         return NULL;
                 }
         }
@@ -11369,7 +11372,7 @@ static int FAST_FUNC builtin_fg_bg(char **argv)
                         delete_finished_job(pi);
                         return EXIT_SUCCESS;
                 }
-                bb_perror_msg("kill (SIGCONT)");
+                bb_simple_perror_msg("kill (SIGCONT)");
         }
 
         if (argv[0][0] == 'f') {
diff --git a/shell/shell_common.c b/shell/shell_common.c
index d1df5888c..06a6b6e5f 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -668,7 +668,7 @@ shell_builtin_ulimit(char **argv)
                                 limit.rlim_cur = val;
 //bb_error_msg("setrlimit(%d, %lld, %lld)", limits_tbl[i].cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max);
                         if (setrlimit(limits_tbl[i].cmd, &limit) < 0) {
-                                bb_perror_msg("error setting limit");
+                                bb_simple_perror_msg("error setting limit");
                                 return EXIT_FAILURE;
                         }
                 }