diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-04-23 15:28:28 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-04-23 15:28:28 +0000 |
commit | ed424dbf1d3d4f0448b9bfdc6b6128d4c90514ee (patch) | |
tree | 5b613c1439ae5bb391a398d5f5a0f011d4da9215 /shell/cmdedit.c | |
parent | d8862928c25be9b00f6755cf445773cd1e4cc22a (diff) | |
download | busybox-w32-ed424dbf1d3d4f0448b9bfdc6b6128d4c90514ee.tar.gz busybox-w32-ed424dbf1d3d4f0448b9bfdc6b6128d4c90514ee.tar.bz2 busybox-w32-ed424dbf1d3d4f0448b9bfdc6b6128d4c90514ee.zip |
Some patches from Gennady Feldman. Fixed a glob problem such that
'ls *.h Config.h' works. Fixed a silly typo with fg/bg process control.
Made cmdedit exit sanely when it cannot read input.
Diffstat (limited to 'shell/cmdedit.c')
-rw-r--r-- | shell/cmdedit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shell/cmdedit.c b/shell/cmdedit.c index eef1a88c8..ce5450032 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c | |||
@@ -1211,7 +1211,8 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ]) | |||
1211 | fflush(stdout); /* buffered out to fast */ | 1211 | fflush(stdout); /* buffered out to fast */ |
1212 | 1212 | ||
1213 | if (read(inputFd, &c, 1) < 1) | 1213 | if (read(inputFd, &c, 1) < 1) |
1214 | return; | 1214 | /* if we can't read input then exit */ |
1215 | goto prepare_to_die; | ||
1215 | 1216 | ||
1216 | switch (c) { | 1217 | switch (c) { |
1217 | case '\n': | 1218 | case '\n': |
@@ -1243,6 +1244,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ]) | |||
1243 | /* Control-d -- Delete one character, or exit | 1244 | /* Control-d -- Delete one character, or exit |
1244 | * if the len=0 and no chars to delete */ | 1245 | * if the len=0 and no chars to delete */ |
1245 | if (len == 0) { | 1246 | if (len == 0) { |
1247 | prepare_to_die: | ||
1246 | printf("exit"); | 1248 | printf("exit"); |
1247 | clean_up_and_die(0); | 1249 | clean_up_and_die(0); |
1248 | } else { | 1250 | } else { |