Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge

4 files changed, 76 insertions, 36 deletions

diff --git a/shell/Config.src b/shell/Config.src
index e96c21620..b31e62dda 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -136,4 +136,14 @@ config FEATURE_SH_NOFORK
           This feature is relatively new. Use with care. Report bugs
           to project mailing list.
 
+config FEATURE_SH_HISTFILESIZE
+        bool "Use $HISTFILESIZE"
+        default y
+        depends on HUSH || ASH
+        help
+          This option makes busybox shells to use $HISTFILESIZE variable
+          to set shell history size. Note that its max value is capped
+          by "History size" setting in library tuning section.
+
+
 endmenu
diff --git a/shell/ash.c b/shell/ash.c
index d12a483a3..eaaa71967 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3658,13 +3658,18 @@ setsignal(int signo)
         switch (new_act) {
         case S_CATCH:
                 act.sa_handler = signal_handler;
-                act.sa_flags = 0; /* matters only if !DFL and !IGN */
-                sigfillset(&act.sa_mask); /* ditto */
                 break;
         case S_IGN:
                 act.sa_handler = SIG_IGN;
                 break;
         }
+
+        /* flags and mask matter only if !DFL and !IGN, but we do it
+         * for all cases for more deterministic behavior:
+         */
+        act.sa_flags = 0;
+        sigfillset(&act.sa_mask);
+
         sigaction_set(signo, &act);
 
         *t = new_act;
@@ -13765,10 +13770,9 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_EDITING_SAVEHISTORY
         if (iflag) {
                 const char *hp = lookupvar("HISTFILE");
-
-                if (hp == NULL) {
+                if (!hp) {
                         hp = lookupvar("HOME");
-                        if (hp != NULL) {
+                        if (hp) {
                                 char *defhp = concat_path_file(hp, ".ash_history");
                                 setvar("HISTFILE", defhp, 0);
                                 free(defhp);
@@ -13817,6 +13821,10 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                         const char *hp = lookupvar("HISTFILE");
                         if (hp)
                                 line_input_state->hist_file = hp;
+# if ENABLE_FEATURE_SH_HISTFILESIZE
+                        hp = lookupvar("HISTFILESIZE");
+                        line_input_state->max_history = size_from_HISTFILESIZE(hp);
+# endif
                 }
 #endif
  state4: /* XXX ??? - why isn't this before the "if" statement */
diff --git a/shell/hush.c b/shell/hush.c
index e4c3a7d77..d3e957c2f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -445,8 +445,6 @@ enum {
 /* Used for initialization: o_string foo = NULL_O_STRING; */
 #define NULL_O_STRING { NULL }
 
-/* I can almost use ordinary FILE*.  Is open_memstream() universally
- * available?  Where is it documented? */
 typedef struct in_str {
         const char *p;
         /* eof_flag=1: last char in ->p is really an EOF */
@@ -455,6 +453,7 @@ typedef struct in_str {
 #if ENABLE_HUSH_INTERACTIVE
         smallint promptmode; /* 0: PS1, 1: PS2 */
 #endif
+        int last_char;
         FILE *file;
         int (*get) (struct in_str *) FAST_FUNC;
         int (*peek) (struct in_str *) FAST_FUNC;
@@ -1077,22 +1076,22 @@ static void die_if_script(unsigned lineno, const char *fmt, ...)
                 xfunc_die();
 }
 
-static void syntax_error(unsigned lineno, const char *msg)
+static void syntax_error(unsigned lineno UNUSED_PARAM, const char *msg)
 {
         if (msg)
-                die_if_script(lineno, "syntax error: %s", msg);
+                bb_error_msg("syntax error: %s", msg);
         else
-                die_if_script(lineno, "syntax error", NULL);
+                bb_error_msg("syntax error");
 }
 
-static void syntax_error_at(unsigned lineno, const char *msg)
+static void syntax_error_at(unsigned lineno UNUSED_PARAM, const char *msg)
 {
-        die_if_script(lineno, "syntax error at '%s'", msg);
+        bb_error_msg("syntax error at '%s'", msg);
 }
 
-static void syntax_error_unterm_str(unsigned lineno, const char *s)
+static void syntax_error_unterm_str(unsigned lineno UNUSED_PARAM, const char *s)
 {
-        die_if_script(lineno, "syntax error: unterminated %s", s);
+        bb_error_msg("syntax error: unterminated %s", s);
 }
 
 static void syntax_error_unterm_ch(unsigned lineno, char ch)
@@ -1101,12 +1100,12 @@ static void syntax_error_unterm_ch(unsigned lineno, char ch)
         syntax_error_unterm_str(lineno, msg);
 }
 
-static void syntax_error_unexpected_ch(unsigned lineno, int ch)
+static void syntax_error_unexpected_ch(unsigned lineno UNUSED_PARAM, int ch)
 {
         char msg[2];
         msg[0] = ch;
         msg[1] = '\0';
-        die_if_script(lineno, "syntax error: unexpected %s", ch == EOF ? "EOF" : msg);
+        bb_error_msg("syntax error: unexpected %s", ch == EOF ? "EOF" : msg);
 }
 
 #if HUSH_DEBUG < 2
@@ -1843,6 +1842,7 @@ static int FAST_FUNC static_get(struct in_str *i)
         int ch = *i->p;
         if (ch != '\0') {
                 i->p++;
+                i->last_char = ch;
                 return ch;
         }
         return EOF;
@@ -1964,6 +1964,7 @@ static int FAST_FUNC file_get(struct in_str *i)
                 do ch = fgetc(i->file); while (ch == '\0');
         }
         debug_printf("file_get: got '%c' %d\n", ch, ch);
+        i->last_char = ch;
         return ch;
 }
 
@@ -4008,7 +4009,7 @@ static int encode_string(o_string *as_string,
  * Scan input until EOF or end_trigger char.
  * Return a list of pipes to execute, or NULL on EOF
  * or if end_trigger character is met.
- * On syntax error, exit is shell is not interactive,
+ * On syntax error, exit if shell is not interactive,
  * reset parsing machinery and start parsing anew,
  * or return ERR_PTR.
  */
@@ -4037,8 +4038,6 @@ static struct pipe *parse_stream(char **pstring,
          * here we should use blank chars as separators, not $IFS
          */
 
- reset: /* we come back here only on syntax errors in interactive shell */
-
         if (MAYBE_ASSIGNMENT != 0)
                 dest.o_assignment = MAYBE_ASSIGNMENT;
         initialize_context(&ctx);
@@ -4530,22 +4529,15 @@ static struct pipe *parse_stream(char **pstring,
                         }
                         IF_HAS_KEYWORDS(pctx = p2;)
                 } while (HAS_KEYWORDS && pctx);
-                /* Free text, clear all dest fields */
+
                 o_free(&dest);
-                /* If we are not in top-level parse, we return,
-                 * our caller will propagate error.
-                 */
-                if (end_trigger != ';') {
+                G.last_exitcode = 1;
 #if !BB_MMU
-                        if (pstring)
-                                *pstring = NULL;
+                if (pstring)
+                        *pstring = NULL;
 #endif
-                        debug_leave();
-                        return ERR_PTR;
-                }
-                /* Discard cached input, force prompt */
-                input->p = NULL;
-                goto reset;
+                debug_leave();
+                return ERR_PTR;
         }
 }
 
@@ -5550,8 +5542,24 @@ static void parse_and_run_stream(struct in_str *inp, int end_trigger)
                         inp->promptmode = 0; /* PS1 */
 #endif
                 pipe_list = parse_stream(NULL, inp, end_trigger);
-                if (!pipe_list) { /* EOF */
-                        if (empty)
+                if (!pipe_list || pipe_list == ERR_PTR) { /* EOF/error */
+                        /* If we are in "big" script
+                         * (not in `cmd` or something similar)...
+                         */
+                        if (pipe_list == ERR_PTR && end_trigger == ';') {
+                                /* Discard cached input (rest of line) */
+                                int ch = inp->last_char;
+                                while (ch != EOF && ch != '\n') {
+                                        //bb_error_msg("Discarded:'%c'", ch);
+                                        ch = i_getch(inp);
+                                }
+                                /* Force prompt */
+                                inp->p = NULL;
+                                /* This stream isn't empty */
+                                empty = 0;
+                                continue;
+                        }
+                        if (!pipe_list && empty)
                                 G.last_exitcode = 0;
                         break;
                 }
@@ -7606,6 +7614,10 @@ int hush_main(int argc, char **argv)
                                 //set_local_var(xasprintf("HISTFILE=%s", ...));
                         }
                 }
+# if ENABLE_FEATURE_SH_HISTFILESIZE
+                hp = get_local_var_value("HISTFILESIZE");
+                G.line_input_state->max_history = size_from_HISTFILESIZE(hp);
+# endif
         }
 # endif
 #endif
@@ -8630,8 +8642,6 @@ static int FAST_FUNC builtin_source(char **argv)
 #endif
         save_and_replace_G_args(&sv, argv);
 
-//TODO: syntax errors in sourced file should never abort the "calling" script.
-//Try: bash -c '. ./bad_file; echo YES'
         parse_and_run_file(input);
         fclose(input);
 
diff --git a/shell/shell_common.c b/shell/shell_common.c
index c7b5b6122..75f4b3e54 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -286,6 +286,12 @@ static const struct limits limits_tbl[] = {
 #ifdef RLIMIT_LOCKS
         { RLIMIT_LOCKS,         0,      'w',    "locks" },
 #endif
+#ifdef RLIMIT_NICE
+        { RLIMIT_NICE,          0,      'e',    "scheduling priority" },
+#endif
+#ifdef RLIMIT_RTPRIO
+        { RLIMIT_RTPRIO,        0,      'r',    "real-time priority" },
+#endif
 };
 
 enum {
@@ -328,6 +334,12 @@ static const char ulimit_opt_string[] = "-HSa"
 #ifdef RLIMIT_LOCKS
                         "w::"
 #endif
+#ifdef RLIMIT_NICE
+                        "e::"
+#endif
+#ifdef RLIMIT_RTPRIO
+                        "r::"
+#endif
                         ;
 
 #if ENABLE_PLATFORM_MINGW32