diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-03-09 00:42:46 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-03-09 00:42:46 +0000 |
| commit | b180dd9e50ec3ccdd702c9467cedebd3d9972432 (patch) | |
| tree | 656b778ba72ca18571d8d215afc669a1c39cd3e0 | |
| parent | 13d1fa1d01e48c7a23cc1114fc4d45b20f2c48eb (diff) | |
| download | busybox-b180dd9e50ec3ccdd702c9467cedebd3d9972432.tar.gz | |
Cleanup patch from Larry
| -rw-r--r-- | lash.c | 7 | ||||
| -rw-r--r-- | sh.c | 7 | ||||
| -rw-r--r-- | shell/lash.c | 7 |
3 files changed, 15 insertions, 6 deletions
@@ -61,6 +61,9 @@ #include <unistd.h> #include <getopt.h> +#undef __GLIBC__ +#undef __UCLIBC__ + #if ( (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) ) || defined (__UCLIBC__) #include <wordexp.h> #define expand_t wordexp_t @@ -983,7 +986,7 @@ static int expand_arguments(char *command) error_msg("out of space during expansion"); return FALSE; } - if (retval == GLOB_ABORTED || retval == GLOB_NOSYS) { + if (retval != 0 && retval != GLOB_NOMATCH) { /* Some other error. */ error_msg("syntax error"); return FALSE; @@ -1722,9 +1725,9 @@ static int busy_loop(FILE * input) #ifdef BB_FEATURE_SH_ENVIRONMENT last_return_code=WEXITSTATUS(status); -#endif debug_printf("'%s' exited -- return code %d\n", job_list.fg->text, last_return_code); +#endif if (!job_list.fg->running_progs) { /* child exited */ remove_job(&job_list, job_list.fg); @@ -61,6 +61,9 @@ #include <unistd.h> #include <getopt.h> +#undef __GLIBC__ +#undef __UCLIBC__ + #if ( (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) ) || defined (__UCLIBC__) #include <wordexp.h> #define expand_t wordexp_t @@ -983,7 +986,7 @@ static int expand_arguments(char *command) error_msg("out of space during expansion"); return FALSE; } - if (retval == GLOB_ABORTED || retval == GLOB_NOSYS) { + if (retval != 0 && retval != GLOB_NOMATCH) { /* Some other error. */ error_msg("syntax error"); return FALSE; @@ -1722,9 +1725,9 @@ static int busy_loop(FILE * input) #ifdef BB_FEATURE_SH_ENVIRONMENT last_return_code=WEXITSTATUS(status); -#endif debug_printf("'%s' exited -- return code %d\n", job_list.fg->text, last_return_code); +#endif if (!job_list.fg->running_progs) { /* child exited */ remove_job(&job_list, job_list.fg); diff --git a/shell/lash.c b/shell/lash.c index 8b7981b4d..6a692d745 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -61,6 +61,9 @@ #include <unistd.h> #include <getopt.h> +#undef __GLIBC__ +#undef __UCLIBC__ + #if ( (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) ) || defined (__UCLIBC__) #include <wordexp.h> #define expand_t wordexp_t @@ -983,7 +986,7 @@ static int expand_arguments(char *command) error_msg("out of space during expansion"); return FALSE; } - if (retval == GLOB_ABORTED || retval == GLOB_NOSYS) { + if (retval != 0 && retval != GLOB_NOMATCH) { /* Some other error. */ error_msg("syntax error"); return FALSE; @@ -1722,9 +1725,9 @@ static int busy_loop(FILE * input) #ifdef BB_FEATURE_SH_ENVIRONMENT last_return_code=WEXITSTATUS(status); -#endif debug_printf("'%s' exited -- return code %d\n", job_list.fg->text, last_return_code); +#endif if (!job_list.fg->running_progs) { /* child exited */ remove_job(&job_list, job_list.fg); |