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

hush: fix "export a=a b=b" (was not setting and exporting b)

Browse Source 
function                                             old     new   delta
builtin_export                                       103     117     +14
This commit is contained in:
Denis Vlasenko 2009-04-06 11:33:07 +00:00
parent c8d27334a0
commit b0a6478eef
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
shell/hush.c
View File

@ -5442,8 +5442,8 @@ static int builtin_eval(char **argv)
{ {
int rcode = EXIT_SUCCESS; int rcode = EXIT_SUCCESS;
if (argv[1]) { if (*++argv) {
char *str = expand_strvec_to_string(argv + 1); char *str = expand_strvec_to_string(argv);
/* bash: /* bash:
* eval "echo Hi; done" ("done" is syntax error): * eval "echo Hi; done" ("done" is syntax error):
* "echo Hi" will not execute too. * "echo Hi" will not execute too.
@ -5458,13 +5458,14 @@ static int builtin_eval(char **argv)
static int builtin_cd(char **argv) static int builtin_cd(char **argv)
{ {
const char *newdir; const char *newdir;
if (argv[1] == NULL) { if (*++argv == NULL) {
/* bash does nothing (exitcode 0) if HOME is ""; if it's unset, /* bash does nothing (exitcode 0) if HOME is ""; if it's unset,
* bash says "bash: cd: HOME not set" and does nothing (exitcode 1) * bash says "bash: cd: HOME not set" and does nothing (exitcode 1)
*/ */
newdir = getenv("HOME") ? : "/"; newdir = getenv("HOME") ? : "/";
} else } else {
newdir = argv[1]; newdir = *argv;
}
if (chdir(newdir)) { if (chdir(newdir)) {
printf("cd: %s: %s\n", newdir, strerror(errno)); printf("cd: %s: %s\n", newdir, strerror(errno));
return EXIT_FAILURE; return EXIT_FAILURE;
@ -5475,14 +5476,14 @@ static int builtin_cd(char **argv)
static int builtin_exec(char **argv) static int builtin_exec(char **argv)
{ {
if (argv[1] == NULL) if (*++argv == NULL)
return EXIT_SUCCESS; /* bash does this */ return EXIT_SUCCESS; /* bash does this */
{ {
#if !BB_MMU #if !BB_MMU
nommu_save_t dummy; nommu_save_t dummy;
#endif #endif
// FIXME: if exec fails, bash does NOT exit! We do... // FIXME: if exec fails, bash does NOT exit! We do...
pseudo_exec_argv(&dummy, argv + 1, 0, NULL); pseudo_exec_argv(&dummy, argv, 0, NULL);
/* never returns */ /* never returns */
} }
} }
@ -5493,20 +5494,17 @@ static int builtin_exit(char **argv)
//puts("exit"); /* bash does it */ //puts("exit"); /* bash does it */
// TODO: warn if we have background jobs: "There are stopped jobs" // TODO: warn if we have background jobs: "There are stopped jobs"
// On second consecutive 'exit', exit anyway. // On second consecutive 'exit', exit anyway.
if (argv[1] == NULL) if (*++argv == NULL)
hush_exit(G.last_return_code); hush_exit(G.last_return_code);
/* mimic bash: exit 123abc == exit 255 + error msg */ /* mimic bash: exit 123abc == exit 255 + error msg */
xfunc_error_retval = 255; xfunc_error_retval = 255;
/* bash: exit -2 == exit 254, no error msg */ /* bash: exit -2 == exit 254, no error msg */
hush_exit(xatoi(argv[1]) & 0xff); hush_exit(xatoi(*argv) & 0xff);
} }
static int builtin_export(char **argv) static int builtin_export(char **argv)
{ {
const char *value; if (*++argv == NULL) {
char *name = argv[1];
if (name == NULL) {
// TODO: // TODO:
// ash emits: export VAR='VAL' // ash emits: export VAR='VAL'
// bash: declare -x VAR="VAL" // bash: declare -x VAR="VAL"
@ -5518,23 +5516,28 @@ static int builtin_export(char **argv)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
value = strchr(name, '='); do {
if (!value) { const char *value;
/* They are exporting something without a =VALUE */ char *name = *argv;
struct variable *var;
var = get_local_var(name); value = strchr(name, '=');
if (var) { if (!value) {
var->flg_export = 1; /* They are exporting something without a =VALUE */
debug_printf_env("%s: putenv '%s'\n", __func__, var->varstr); struct variable *var;
putenv(var->varstr);
var = get_local_var(name);
if (var) {
var->flg_export = 1;
debug_printf_env("%s: putenv '%s'\n", __func__, var->varstr);
putenv(var->varstr);
}
/* bash does not return an error when trying to export
* an undefined variable. Do likewise. */
continue;
} }
/* bash does not return an error when trying to export set_local_var(xstrdup(name), 1, 0);
* an undefined variable. Do likewise. */ } while (*++argv);
return EXIT_SUCCESS;
}
set_local_var(xstrdup(name), 1, 0);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }