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

Another update from Larry:

Browse Source 
Makes hush return code equal to that of the last command executed.
    Fixes the mode where input comes from a file.
This commit is contained in:
Eric Andersen 2001-05-02 02:09:36 +00:00
parent e0244b0642
commit e67c3ce327
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hush.c
View File

@ -445,7 +445,7 @@ static int builtin_exec(struct child_prog *child)
static int builtin_exit(struct child_prog *child) static int builtin_exit(struct child_prog *child)
{ {
if (child->argv[1] == NULL) if (child->argv[1] == NULL)
exit(EXIT_SUCCESS); exit(last_return_code);
exit (atoi(child->argv[1])); exit (atoi(child->argv[1]));
} }
@ -814,17 +814,14 @@ static int file_get(struct in_str *i)
if (i->__promptme && interactive && i->file == stdin) { if (i->__promptme && interactive && i->file == stdin) {
get_user_input(i); get_user_input(i);
i->promptmode=2; i->promptmode=2;
i->__promptme = 0;
if (i->p && *i->p) {
ch=*i->p++;
}
} else { } else {
static char buffer; ch = fgetc(i->file);
buffer = fgetc(i->file);
i->p = &buffer;
} }
i->__promptme = 0;
if (i->p && *i->p) {
ch=*i->p++;
}
debug_printf("b_getch: got a %d\n", ch); debug_printf("b_getch: got a %d\n", ch);
} }
if (ch == '\n') i->__promptme=1; if (ch == '\n') i->__promptme=1;
@ -839,9 +836,10 @@ static int file_peek(struct in_str *i)
if (i->p && *i->p) { if (i->p && *i->p) {
return *i->p; return *i->p;
} else { } else {
static char buffer; static char buffer[2];
buffer = fgetc(i->file); buffer[0] = fgetc(i->file);
i->p = &buffer; buffer[1] = '\0';
i->p = buffer;
debug_printf("b_peek: got a %d\n", *i->p); debug_printf("b_peek: got a %d\n", *i->p);
return *i->p; return *i->p;
} }
@ -2081,6 +2079,8 @@ int shell_main(int argc, char **argv)
int opt; int opt;
FILE *input; FILE *input;
last_return_code=EXIT_SUCCESS;
/* XXX what should these be while sourcing /etc/profile? */ /* XXX what should these be while sourcing /etc/profile? */
global_argc = argc; global_argc = argc;
global_argv = argv; global_argv = argv;
@ -2110,7 +2110,7 @@ int shell_main(int argc, char **argv)
global_argv = argv+optind; global_argv = argv+optind;
global_argc = argc-optind; global_argc = argc-optind;
opt = parse_string_outer(optarg); opt = parse_string_outer(optarg);
exit(opt); goto final_return;
} }
break; break;
case 'i': case 'i':
@ -2136,13 +2136,14 @@ int shell_main(int argc, char **argv)
isatty(fileno(stdin)) && isatty(fileno(stdout))) { isatty(fileno(stdin)) && isatty(fileno(stdout))) {
interactive++; interactive++;
} }
debug_printf("\ninteractive=%d\n", interactive);
if (interactive) { if (interactive) {
/* Looks like they want an interactive shell */ /* Looks like they want an interactive shell */
fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n"); fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n");
exit(parse_file_outer(stdin)); opt=parse_file_outer(stdin);
goto final_return;
} }
debug_printf("\ninteractive=%d\n", interactive);
debug_printf("\nrunning script '%s'\n", argv[optind]); debug_printf("\nrunning script '%s'\n", argv[optind]);
global_argv = argv+optind; global_argv = argv+optind;
@ -2154,5 +2155,6 @@ int shell_main(int argc, char **argv)
fclose(input.file); fclose(input.file);
#endif #endif
return(opt); final_return:
return(opt?opt:last_return_code);
} }

36
shell/hush.c
View File

@ -445,7 +445,7 @@ static int builtin_exec(struct child_prog *child)
static int builtin_exit(struct child_prog *child) static int builtin_exit(struct child_prog *child)
{ {
if (child->argv[1] == NULL) if (child->argv[1] == NULL)
exit(EXIT_SUCCESS); exit(last_return_code);
exit (atoi(child->argv[1])); exit (atoi(child->argv[1]));
} }
@ -814,17 +814,14 @@ static int file_get(struct in_str *i)
if (i->__promptme && interactive && i->file == stdin) { if (i->__promptme && interactive && i->file == stdin) {
get_user_input(i); get_user_input(i);
i->promptmode=2; i->promptmode=2;
i->__promptme = 0;
if (i->p && *i->p) {
ch=*i->p++;
}
} else { } else {
static char buffer; ch = fgetc(i->file);
buffer = fgetc(i->file);
i->p = &buffer;
} }
i->__promptme = 0;
if (i->p && *i->p) {
ch=*i->p++;
}
debug_printf("b_getch: got a %d\n", ch); debug_printf("b_getch: got a %d\n", ch);
} }
if (ch == '\n') i->__promptme=1; if (ch == '\n') i->__promptme=1;
@ -839,9 +836,10 @@ static int file_peek(struct in_str *i)
if (i->p && *i->p) { if (i->p && *i->p) {
return *i->p; return *i->p;
} else { } else {
static char buffer; static char buffer[2];
buffer = fgetc(i->file); buffer[0] = fgetc(i->file);
i->p = &buffer; buffer[1] = '\0';
i->p = buffer;
debug_printf("b_peek: got a %d\n", *i->p); debug_printf("b_peek: got a %d\n", *i->p);
return *i->p; return *i->p;
} }
@ -2081,6 +2079,8 @@ int shell_main(int argc, char **argv)
int opt; int opt;
FILE *input; FILE *input;
last_return_code=EXIT_SUCCESS;
/* XXX what should these be while sourcing /etc/profile? */ /* XXX what should these be while sourcing /etc/profile? */
global_argc = argc; global_argc = argc;
global_argv = argv; global_argv = argv;
@ -2110,7 +2110,7 @@ int shell_main(int argc, char **argv)
global_argv = argv+optind; global_argv = argv+optind;
global_argc = argc-optind; global_argc = argc-optind;
opt = parse_string_outer(optarg); opt = parse_string_outer(optarg);
exit(opt); goto final_return;
} }
break; break;
case 'i': case 'i':
@ -2136,13 +2136,14 @@ int shell_main(int argc, char **argv)
isatty(fileno(stdin)) && isatty(fileno(stdout))) { isatty(fileno(stdin)) && isatty(fileno(stdout))) {
interactive++; interactive++;
} }
debug_printf("\ninteractive=%d\n", interactive);
if (interactive) { if (interactive) {
/* Looks like they want an interactive shell */ /* Looks like they want an interactive shell */
fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n"); fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n");
exit(parse_file_outer(stdin)); opt=parse_file_outer(stdin);
goto final_return;
} }
debug_printf("\ninteractive=%d\n", interactive);
debug_printf("\nrunning script '%s'\n", argv[optind]); debug_printf("\nrunning script '%s'\n", argv[optind]);
global_argv = argv+optind; global_argv = argv+optind;
@ -2154,5 +2155,6 @@ int shell_main(int argc, char **argv)
fclose(input.file); fclose(input.file);
#endif #endif
return(opt); final_return:
return(opt?opt:last_return_code);
} }