Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-14 12:30:40 +00:00
Code Issues Projects Releases Wiki Activity

Move init of a bunch of globals into main so we are at least

Browse Source 
a bit more reentrant.
 -Erik
This commit is contained in:
Eric Andersen 2001-05-16 05:24:03 +00:00
parent f72f562b2f
commit bc604a2f41
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hush.c
View File

@ -239,17 +239,17 @@ unsigned int shell_context; /* Used in cmdedit.c to reset the
* context when someone hits ^C */ * context when someone hits ^C */
/* "globals" within this file */ /* "globals" within this file */
static char *ifs=NULL; static char *ifs;
static char map[256]; static char map[256];
static int fake_mode=0; static int fake_mode;
static int interactive=0; static int interactive;
static struct close_me *close_me_head = NULL; static struct close_me *close_me_head;
static const char *cwd; static const char *cwd;
static struct jobset *job_list; static struct jobset *job_list;
static unsigned int last_bg_pid=0; static unsigned int last_bg_pid;
static char *PS1; static char *PS1;
static char *PS2 = "> "; static char *PS2;
static char **__shell_local_env = 0; static char **__shell_local_env;
#define B_CHUNK (100) #define B_CHUNK (100)
#define B_NOSPAC 1 #define B_NOSPAC 1
@ -2511,7 +2511,16 @@ int shell_main(int argc, char **argv)
int opt; int opt;
FILE *input; FILE *input;
struct jobset joblist_end = { NULL, NULL }; struct jobset joblist_end = { NULL, NULL };
/* (re?) initialize globals */
ifs=NULL;
fake_mode=0;
interactive=0;
close_me_head = NULL;
job_list = &joblist_end; job_list = &joblist_end;
last_bg_pid=0;
PS2 = "> ";
__shell_local_env = 0;
last_return_code=EXIT_SUCCESS; last_return_code=EXIT_SUCCESS;

23
shell/hush.c
View File

@ -239,17 +239,17 @@ unsigned int shell_context; /* Used in cmdedit.c to reset the
* context when someone hits ^C */ * context when someone hits ^C */
/* "globals" within this file */ /* "globals" within this file */
static char *ifs=NULL; static char *ifs;
static char map[256]; static char map[256];
static int fake_mode=0; static int fake_mode;
static int interactive=0; static int interactive;
static struct close_me *close_me_head = NULL; static struct close_me *close_me_head;
static const char *cwd; static const char *cwd;
static struct jobset *job_list; static struct jobset *job_list;
static unsigned int last_bg_pid=0; static unsigned int last_bg_pid;
static char *PS1; static char *PS1;
static char *PS2 = "> "; static char *PS2;
static char **__shell_local_env = 0; static char **__shell_local_env;
#define B_CHUNK (100) #define B_CHUNK (100)
#define B_NOSPAC 1 #define B_NOSPAC 1
@ -2511,7 +2511,16 @@ int shell_main(int argc, char **argv)
int opt; int opt;
FILE *input; FILE *input;
struct jobset joblist_end = { NULL, NULL }; struct jobset joblist_end = { NULL, NULL };
/* (re?) initialize globals */
ifs=NULL;
fake_mode=0;
interactive=0;
close_me_head = NULL;
job_list = &joblist_end; job_list = &joblist_end;
last_bg_pid=0;
PS2 = "> ";
__shell_local_env = 0;
last_return_code=EXIT_SUCCESS; last_return_code=EXIT_SUCCESS;