diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-01-05 19:37:32 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-01-05 19:37:32 +0000 |
commit | 0bcc813a3494fcf31dda25258ed3facc034c77f6 (patch) | |
tree | 936b7165cba1b700fd7b43b562e92f46250a8802 | |
parent | b0970d4fede16b6c1186b677c6d7d9e4652e459a (diff) | |
download | busybox-w32-0bcc813a3494fcf31dda25258ed3facc034c77f6.tar.gz busybox-w32-0bcc813a3494fcf31dda25258ed3facc034c77f6.tar.bz2 busybox-w32-0bcc813a3494fcf31dda25258ed3facc034c77f6.zip |
Better label the globals.
-rw-r--r-- | lash.c | 9 | ||||
-rw-r--r-- | sh.c | 9 | ||||
-rw-r--r-- | shell/lash.c | 9 |
3 files changed, 21 insertions, 6 deletions
@@ -73,8 +73,6 @@ static const unsigned int IF_TRUE_CONTEXT=0x2; | |||
73 | static const unsigned int IF_FALSE_CONTEXT=0x4; | 73 | static const unsigned int IF_FALSE_CONTEXT=0x4; |
74 | static const unsigned int THEN_EXP_CONTEXT=0x8; | 74 | static const unsigned int THEN_EXP_CONTEXT=0x8; |
75 | static const unsigned int ELSE_EXP_CONTEXT=0x10; | 75 | static const unsigned int ELSE_EXP_CONTEXT=0x10; |
76 | unsigned int shell_context; | ||
77 | |||
78 | 76 | ||
79 | 77 | ||
80 | struct jobset { | 78 | struct jobset { |
@@ -184,6 +182,13 @@ static struct built_in_command bltins_forking[] = { | |||
184 | {NULL, NULL, NULL} | 182 | {NULL, NULL, NULL} |
185 | }; | 183 | }; |
186 | 184 | ||
185 | |||
186 | /* Variables we export */ | ||
187 | unsigned int shell_context; /* Used in cmdedit.c to reset the | ||
188 | context when someone hits ^C */ | ||
189 | |||
190 | |||
191 | /* Globals that are static to this file */ | ||
187 | static char *cwd; | 192 | static char *cwd; |
188 | static char *local_pending_command; | 193 | static char *local_pending_command; |
189 | static struct jobset job_list = { NULL, NULL }; | 194 | static struct jobset job_list = { NULL, NULL }; |
@@ -73,8 +73,6 @@ static const unsigned int IF_TRUE_CONTEXT=0x2; | |||
73 | static const unsigned int IF_FALSE_CONTEXT=0x4; | 73 | static const unsigned int IF_FALSE_CONTEXT=0x4; |
74 | static const unsigned int THEN_EXP_CONTEXT=0x8; | 74 | static const unsigned int THEN_EXP_CONTEXT=0x8; |
75 | static const unsigned int ELSE_EXP_CONTEXT=0x10; | 75 | static const unsigned int ELSE_EXP_CONTEXT=0x10; |
76 | unsigned int shell_context; | ||
77 | |||
78 | 76 | ||
79 | 77 | ||
80 | struct jobset { | 78 | struct jobset { |
@@ -184,6 +182,13 @@ static struct built_in_command bltins_forking[] = { | |||
184 | {NULL, NULL, NULL} | 182 | {NULL, NULL, NULL} |
185 | }; | 183 | }; |
186 | 184 | ||
185 | |||
186 | /* Variables we export */ | ||
187 | unsigned int shell_context; /* Used in cmdedit.c to reset the | ||
188 | context when someone hits ^C */ | ||
189 | |||
190 | |||
191 | /* Globals that are static to this file */ | ||
187 | static char *cwd; | 192 | static char *cwd; |
188 | static char *local_pending_command; | 193 | static char *local_pending_command; |
189 | static struct jobset job_list = { NULL, NULL }; | 194 | static struct jobset job_list = { NULL, NULL }; |
diff --git a/shell/lash.c b/shell/lash.c index c756a2749..9e017b169 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
@@ -73,8 +73,6 @@ static const unsigned int IF_TRUE_CONTEXT=0x2; | |||
73 | static const unsigned int IF_FALSE_CONTEXT=0x4; | 73 | static const unsigned int IF_FALSE_CONTEXT=0x4; |
74 | static const unsigned int THEN_EXP_CONTEXT=0x8; | 74 | static const unsigned int THEN_EXP_CONTEXT=0x8; |
75 | static const unsigned int ELSE_EXP_CONTEXT=0x10; | 75 | static const unsigned int ELSE_EXP_CONTEXT=0x10; |
76 | unsigned int shell_context; | ||
77 | |||
78 | 76 | ||
79 | 77 | ||
80 | struct jobset { | 78 | struct jobset { |
@@ -184,6 +182,13 @@ static struct built_in_command bltins_forking[] = { | |||
184 | {NULL, NULL, NULL} | 182 | {NULL, NULL, NULL} |
185 | }; | 183 | }; |
186 | 184 | ||
185 | |||
186 | /* Variables we export */ | ||
187 | unsigned int shell_context; /* Used in cmdedit.c to reset the | ||
188 | context when someone hits ^C */ | ||
189 | |||
190 | |||
191 | /* Globals that are static to this file */ | ||
187 | static char *cwd; | 192 | static char *cwd; |
188 | static char *local_pending_command; | 193 | static char *local_pending_command; |
189 | static struct jobset job_list = { NULL, NULL }; | 194 | static struct jobset job_list = { NULL, NULL }; |