diff options
Diffstat (limited to 'hush.c')
-rw-r--r-- | hush.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -237,10 +237,6 @@ unsigned int global_argc; | |||
237 | unsigned int last_return_code; | 237 | unsigned int last_return_code; |
238 | extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */ | 238 | extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */ |
239 | 239 | ||
240 | /* Variables we export */ | ||
241 | unsigned int shell_context; /* Used in cmdedit.c to reset the | ||
242 | * context when someone hits ^C */ | ||
243 | |||
244 | /* "globals" within this file */ | 240 | /* "globals" within this file */ |
245 | static char *ifs; | 241 | static char *ifs; |
246 | static char map[256]; | 242 | static char map[256]; |
@@ -883,7 +879,6 @@ static void get_user_input(struct in_str *i) | |||
883 | ** child processes (rob@sysgo.de) | 879 | ** child processes (rob@sysgo.de) |
884 | */ | 880 | */ |
885 | cmdedit_read_input(prompt_str, the_command); | 881 | cmdedit_read_input(prompt_str, the_command); |
886 | cmdedit_terminate(); | ||
887 | #else | 882 | #else |
888 | fputs(prompt_str, stdout); | 883 | fputs(prompt_str, stdout); |
889 | fflush(stdout); | 884 | fflush(stdout); |
@@ -1411,6 +1406,7 @@ static int run_pipe_real(struct pipe *pi) | |||
1411 | /* Set the handling for job control signals back to the default. */ | 1406 | /* Set the handling for job control signals back to the default. */ |
1412 | signal(SIGINT, SIG_DFL); | 1407 | signal(SIGINT, SIG_DFL); |
1413 | signal(SIGQUIT, SIG_DFL); | 1408 | signal(SIGQUIT, SIG_DFL); |
1409 | signal(SIGTERM, SIG_DFL); | ||
1414 | signal(SIGTSTP, SIG_DFL); | 1410 | signal(SIGTSTP, SIG_DFL); |
1415 | signal(SIGTTIN, SIG_DFL); | 1411 | signal(SIGTTIN, SIG_DFL); |
1416 | signal(SIGTTOU, SIG_DFL); | 1412 | signal(SIGTTOU, SIG_DFL); |
@@ -2551,6 +2547,7 @@ static void setup_job_control() | |||
2551 | /* Ignore interactive and job-control signals. */ | 2547 | /* Ignore interactive and job-control signals. */ |
2552 | signal(SIGINT, SIG_IGN); | 2548 | signal(SIGINT, SIG_IGN); |
2553 | signal(SIGQUIT, SIG_IGN); | 2549 | signal(SIGQUIT, SIG_IGN); |
2550 | signal(SIGTERM, SIG_IGN); | ||
2554 | signal(SIGTSTP, SIG_IGN); | 2551 | signal(SIGTSTP, SIG_IGN); |
2555 | signal(SIGTTIN, SIG_IGN); | 2552 | signal(SIGTTIN, SIG_IGN); |
2556 | signal(SIGTTOU, SIG_IGN); | 2553 | signal(SIGTTOU, SIG_IGN); |