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

Cope gracefully when people type something, then hit ^C.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2001-05-31 17:17:12 +00:00
parent 4f990533e3
commit 4f6753e586
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hush.c
View File

@ -891,6 +891,7 @@ static void get_user_input(struct in_str *i)
the_command[0]=fgetc(i->file); the_command[0]=fgetc(i->file);
the_command[1]='\0'; the_command[1]='\0';
#endif #endif
fflush(stdout);
i->p = the_command; i->p = the_command;
} }
@ -908,7 +909,9 @@ static int file_get(struct in_str *i)
/* need to double check i->file because we might be doing something /* need to double check i->file because we might be doing something
* more complicated by now, like sourcing or substituting. */ * more complicated by now, like sourcing or substituting. */
if (i->__promptme && interactive && i->file == stdin) { if (i->__promptme && interactive && i->file == stdin) {
while(! i->p || (interactive && strlen(i->p)==0) ) {
get_user_input(i); get_user_input(i);
}
i->promptmode=2; i->promptmode=2;
i->__promptme = 0; i->__promptme = 0;
if (i->p && *i->p) { if (i->p && *i->p) {

3
shell/hush.c
View File

@ -891,6 +891,7 @@ static void get_user_input(struct in_str *i)
the_command[0]=fgetc(i->file); the_command[0]=fgetc(i->file);
the_command[1]='\0'; the_command[1]='\0';
#endif #endif
fflush(stdout);
i->p = the_command; i->p = the_command;
} }
@ -908,7 +909,9 @@ static int file_get(struct in_str *i)
/* need to double check i->file because we might be doing something /* need to double check i->file because we might be doing something
* more complicated by now, like sourcing or substituting. */ * more complicated by now, like sourcing or substituting. */
if (i->__promptme && interactive && i->file == stdin) { if (i->__promptme && interactive && i->file == stdin) {
while(! i->p || (interactive && strlen(i->p)==0) ) {
get_user_input(i); get_user_input(i);
}
i->promptmode=2; i->promptmode=2;
i->__promptme = 0; i->__promptme = 0;
if (i->p && *i->p) { if (i->p && *i->p) {