Merge branch 'busybox' into merge

2 files changed, 36 insertions, 12 deletions

diff --git a/shell/ash.c b/shell/ash.c
index d0ccfe982..2e7f68c05 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9724,9 +9724,9 @@ static const struct builtincmd builtintab[] = {
         { BUILTIN_SPEC_REG      ":"       , truecmd    },
 #if ENABLE_ASH_BUILTIN_TEST
         { BUILTIN_REGULAR       "["       , testcmd    },
-#if ENABLE_ASH_BASH_COMPAT
+# if ENABLE_ASH_BASH_COMPAT
         { BUILTIN_REGULAR       "[["      , testcmd    },
-#endif
+# endif
 #endif
 #if ENABLE_ASH_ALIAS
         { BUILTIN_REG_ASSG      "alias"   , aliascmd   },
@@ -10334,13 +10334,16 @@ preadfd(void)
                 reinit_unicode_for_ash();
                 nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
                 if (nr == 0) {
-                        /* Ctrl+C pressed */
+                        /* ^C pressed, "convert" to SIGINT */
+                        write(STDOUT_FILENO, "^C", 2);
                         if (trap[SIGINT]) {
                                 buf[0] = '\n';
                                 buf[1] = '\0';
                                 raise(SIGINT);
                                 return 1;
                         }
+                        exitstatus = 128 + SIGINT;
+                        bb_putchar('\n');
                         goto retry;
                 }
                 if (nr < 0) {
diff --git a/shell/hush.c b/shell/hush.c
index 2f07f4ac1..bcd4dffee 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1746,6 +1746,7 @@ static int check_and_run_traps(void)
                                 argv[2] = NULL;
                                 save_rcode = G.last_exitcode;
                                 builtin_eval(argv);
+//FIXME: shouldn't it be set to 128 + sig instead?
                                 G.last_exitcode = save_rcode;
                                 last_sig = sig;
                         } /* else: "" trap, ignoring signal */
@@ -1755,8 +1756,6 @@ static int check_and_run_traps(void)
                 switch (sig) {
                 case SIGINT:
                         debug_printf_exec("%s: sig:%d default SIGINT handler\n", __func__, sig);
-                        /* Builtin was ^C'ed, make it look prettier: */
-                        bb_putchar('\n');
                         G.flag_SIGINT = 1;
                         last_sig = sig;
                         break;
@@ -2192,18 +2191,30 @@ static int get_user_input(struct in_str *i)
 
         prompt_str = setup_prompt_string(i->promptmode);
 # if ENABLE_FEATURE_EDITING
-        do {
+        for (;;) {
                 reinit_unicode_for_hush();
-                G.flag_SIGINT = 0;
+                if (G.flag_SIGINT) {
+                        /* There was ^C'ed, make it look prettier: */
+                        bb_putchar('\n');
+                        G.flag_SIGINT = 0;
+                }
                 /* buglet: SIGINT will not make new prompt to appear _at once_,
-                 * only after <Enter>. (^C will work) */
+                 * only after <Enter>. (^C works immediately) */
                 r = read_line_input(G.line_input_state, prompt_str,
                                 G.user_input_buf, CONFIG_FEATURE_EDITING_MAX_LEN-1,
                                 /*timeout*/ -1
                 );
-                /* catch *SIGINT* etc (^C is handled by read_line_input) */
+                /* read_line_input intercepts ^C, "convert" it to SIGINT */
+                if (r == 0) {
+                        write(STDOUT_FILENO, "^C", 2);
+                        raise(SIGINT);
+                }
                 check_and_run_traps();
-        } while (r == 0 || G.flag_SIGINT); /* repeat if ^C or SIGINT */
+                if (r != 0 && !G.flag_SIGINT)
+                        break;
+                /* ^C or SIGINT: repeat */
+                G.last_exitcode = 128 + SIGINT;
+        }
         if (r < 0) {
                 /* EOF/error detected */
                 i->p = NULL;
@@ -2213,7 +2224,7 @@ static int get_user_input(struct in_str *i)
         i->p = G.user_input_buf;
         return (unsigned char)*i->p++;
 # else
-        do {
+        for (;;) {
                 G.flag_SIGINT = 0;
                 if (i->last_char == '\0' || i->last_char == '\n') {
                         /* Why check_and_run_traps here? Try this interactively:
@@ -2225,8 +2236,18 @@ static int get_user_input(struct in_str *i)
                         fputs(prompt_str, stdout);
                 }
                 fflush_all();
+//FIXME: here ^C or SIGINT will have effect only after <Enter>
                 r = fgetc(i->file);
-        } while (G.flag_SIGINT || r == '\0');
+                /* In !ENABLE_FEATURE_EDITING we don't use read_line_input,
+                 * no ^C masking happens during fgetc, no special code for ^C:
+                 * it generates SIGINT as usual.
+                 */
+                check_and_run_traps();
+                if (G.flag_SIGINT)
+                        G.last_exitcode = 128 + SIGINT;
+                if (r != '\0')
+                        break;
+        }
         return r;
 # endif
 }