enum entry for unarchive to be used by tar

[oweals/busybox.git] / lash.c

diff --git a/lash.c b/lash.c
index e4ca5f67b9b5b9a5079b06664934686c2de879d4..8f86095349cd17426ebc8ebffb25a50f32befcf2 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -170,9 +170,7 @@ static struct built_in_command bltins_forking[] = {
 };
 
 
-/* Variables we export */
-unsigned int shell_context;  /* Used in cmdedit.c to reset the
-                                                               context when someone hits ^C */
+static int shell_context;  /* Type prompt trigger (PS1 or PS2) */
 
 
 /* Globals that are static to this file */
@@ -319,8 +317,9 @@ static int builtin_fg_bg(struct child_prog *child)
        if ( (i=kill(- job->pgrp, SIGCONT)) < 0) {
                if (i == ESRCH) {
                        remove_job(&job_list, job);
+               } else {
+                       perror_msg("kill (SIGCONT)");
                }
-               perror_msg("kill (SIGCONT)");
        }
 
        return EXIT_SUCCESS;
@@ -715,7 +714,6 @@ static int get_command(FILE * source, char *command)
                ** child processes (rob@sysgo.de)
                */
                cmdedit_read_input(prompt_str, command);
-               cmdedit_terminate();
                return 0;
 #else
                fputs(prompt_str, stdout);
@@ -1556,7 +1554,6 @@ int shell_main(int argc_l, char **argv_l)
 
        /* These variables need re-initializing when recursing */
        last_jobid = 0;
-       shell_context = 0;
        local_pending_command = NULL;
        close_me_head = NULL;
        job_list.head = NULL;