Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-12 00:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Don't fork for the . (source) command so that environment settings are

Browse Source 
preserved.
This commit is contained in:
Matt Kraai 2000-09-13 03:43:36 +00:00
parent 322ae93a5e
commit dd450a0ded
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lash.c
View File

@ -145,6 +145,7 @@ static struct builtInCommand bltins[] = {
{"export", "Set environment variable", builtin_export}, {"export", "Set environment variable", builtin_export},
{"unset", "Unset environment variable", builtin_unset}, {"unset", "Unset environment variable", builtin_unset},
{"read", "Input environment variable", builtin_read}, {"read", "Input environment variable", builtin_read},
{".", "Source-in and run commands in a file", builtin_source},
#ifdef BB_FEATURE_SH_IF_EXPRESSIONS #ifdef BB_FEATURE_SH_IF_EXPRESSIONS
{"if", NULL, builtin_if}, {"if", NULL, builtin_if},
{"then", NULL, builtin_then}, {"then", NULL, builtin_then},
@ -159,7 +160,6 @@ static struct builtInCommand bltins[] = {
static struct builtInCommand bltins_forking[] = { static struct builtInCommand bltins_forking[] = {
{"env", "Print all environment variables", builtin_env}, {"env", "Print all environment variables", builtin_env},
{"pwd", "Print current directory", builtin_pwd}, {"pwd", "Print current directory", builtin_pwd},
{".", "Source-in and run commands in a file", builtin_source},
{"help", "List shell built-in commands", builtin_help}, {"help", "List shell built-in commands", builtin_help},
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
@ -500,6 +500,7 @@ static int builtin_source(struct job *cmd, struct jobSet *junk)
/* Now run the file */ /* Now run the file */
status = busy_loop(input); status = busy_loop(input);
fclose(input);
return (status); return (status);
} }

3
sh.c
View File

@ -145,6 +145,7 @@ static struct builtInCommand bltins[] = {
{"export", "Set environment variable", builtin_export}, {"export", "Set environment variable", builtin_export},
{"unset", "Unset environment variable", builtin_unset}, {"unset", "Unset environment variable", builtin_unset},
{"read", "Input environment variable", builtin_read}, {"read", "Input environment variable", builtin_read},
{".", "Source-in and run commands in a file", builtin_source},
#ifdef BB_FEATURE_SH_IF_EXPRESSIONS #ifdef BB_FEATURE_SH_IF_EXPRESSIONS
{"if", NULL, builtin_if}, {"if", NULL, builtin_if},
{"then", NULL, builtin_then}, {"then", NULL, builtin_then},
@ -159,7 +160,6 @@ static struct builtInCommand bltins[] = {
static struct builtInCommand bltins_forking[] = { static struct builtInCommand bltins_forking[] = {
{"env", "Print all environment variables", builtin_env}, {"env", "Print all environment variables", builtin_env},
{"pwd", "Print current directory", builtin_pwd}, {"pwd", "Print current directory", builtin_pwd},
{".", "Source-in and run commands in a file", builtin_source},
{"help", "List shell built-in commands", builtin_help}, {"help", "List shell built-in commands", builtin_help},
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
@ -500,6 +500,7 @@ static int builtin_source(struct job *cmd, struct jobSet *junk)
/* Now run the file */ /* Now run the file */
status = busy_loop(input); status = busy_loop(input);
fclose(input);
return (status); return (status);
} }

3
shell/lash.c
View File

@ -145,6 +145,7 @@ static struct builtInCommand bltins[] = {
{"export", "Set environment variable", builtin_export}, {"export", "Set environment variable", builtin_export},
{"unset", "Unset environment variable", builtin_unset}, {"unset", "Unset environment variable", builtin_unset},
{"read", "Input environment variable", builtin_read}, {"read", "Input environment variable", builtin_read},
{".", "Source-in and run commands in a file", builtin_source},
#ifdef BB_FEATURE_SH_IF_EXPRESSIONS #ifdef BB_FEATURE_SH_IF_EXPRESSIONS
{"if", NULL, builtin_if}, {"if", NULL, builtin_if},
{"then", NULL, builtin_then}, {"then", NULL, builtin_then},
@ -159,7 +160,6 @@ static struct builtInCommand bltins[] = {
static struct builtInCommand bltins_forking[] = { static struct builtInCommand bltins_forking[] = {
{"env", "Print all environment variables", builtin_env}, {"env", "Print all environment variables", builtin_env},
{"pwd", "Print current directory", builtin_pwd}, {"pwd", "Print current directory", builtin_pwd},
{".", "Source-in and run commands in a file", builtin_source},
{"help", "List shell built-in commands", builtin_help}, {"help", "List shell built-in commands", builtin_help},
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
@ -500,6 +500,7 @@ static int builtin_source(struct job *cmd, struct jobSet *junk)
/* Now run the file */ /* Now run the file */
status = busy_loop(input); status = busy_loop(input);
fclose(input);
return (status); return (status);
} }