emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: fix handling of unmatched ${name (without closing '}') -

Browse Source 
was eating all remaining input, potentially megabytes.
nofork: save/restore die_jmp too
nofork: use -2222 instead of -111 as "special" return valur for zero
(-111 is used by some applets. -2222 won't fit in exitcode and thus safer)
This commit is contained in:
Denis Vlasenko
2007-05-24 12:18:16 +00:00
parent 90e485ce79
commit b055001b6a
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libbb/vfork_daemon_rexec.c
View File

@ -103,6 +103,7 @@ int wait_pid(int *wstat, int pid)
#if ENABLE_FEATURE_PREFER_APPLETS
void save_nofork_data(struct nofork_save_area *save)
{
memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp));
save->current_applet = current_applet;
save->xfunc_error_retval = xfunc_error_retval;
save->option_mask32 = option_mask32;
@ -112,6 +113,7 @@ void save_nofork_data(struct nofork_save_area *save)
void restore_nofork_data(struct nofork_save_area *save)
{
memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp));
current_applet = save->current_applet;
xfunc_error_retval = save->xfunc_error_retval;
option_mask32 = save->option_mask32;
@ -147,7 +149,7 @@ int run_nofork_applet_prime(struct nofork_save_area *old, const struct bb_applet
rc = a->main(argc, tmp_argv);
} else { /* xfunc died in NOFORK applet */
/* in case they meant to return 0... */
if (rc == -111)
if (rc == -2222)
rc = 0;
}
@ -159,6 +161,7 @@ int run_nofork_applet_prime(struct nofork_save_area *old, const struct bb_applet
int run_nofork_applet(const struct bb_applet *a, char **argv)
{
struct nofork_save_area old;
/* Saving globals */
save_nofork_data(&old);
return run_nofork_applet_prime(&old, a, argv);