diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-09 10:03:28 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-09 10:03:28 +0000 |
| commit | 9cb220be9dea5417c1ad0091bb7eeb1371891f89 (patch) | |
| tree | 33e6f2cb5996d5cbf73b1d8fbdbfe955c847cbad /shell | |
| parent | a96425fe827c603b9c576c95f12b885af68eb219 (diff) | |
| download | busybox-w32-9cb220be9dea5417c1ad0091bb7eeb1371891f89.tar.gz busybox-w32-9cb220be9dea5417c1ad0091bb7eeb1371891f89.tar.bz2 busybox-w32-9cb220be9dea5417c1ad0091bb7eeb1371891f89.zip | |
lineedit: don't violate API if we do simple fgets
ash: cosmetic style fixes, no code changes
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 9b9fe5b6d..4c8a28911 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -8553,7 +8553,7 @@ preadfd(void) | |||
| 8553 | goto retry; | 8553 | goto retry; |
| 8554 | } | 8554 | } |
| 8555 | if (nr < 0 && errno == 0) { | 8555 | if (nr < 0 && errno == 0) { |
| 8556 | /* Ctrl+D presend */ | 8556 | /* Ctrl+D pressed */ |
| 8557 | nr = 0; | 8557 | nr = 0; |
| 8558 | } | 8558 | } |
| 8559 | } | 8559 | } |
| @@ -8564,8 +8564,8 @@ preadfd(void) | |||
| 8564 | if (nr < 0) { | 8564 | if (nr < 0) { |
| 8565 | if (parsefile->fd == 0 && errno == EWOULDBLOCK) { | 8565 | if (parsefile->fd == 0 && errno == EWOULDBLOCK) { |
| 8566 | int flags = fcntl(0, F_GETFL); | 8566 | int flags = fcntl(0, F_GETFL); |
| 8567 | if (flags >= 0 && flags & O_NONBLOCK) { | 8567 | if (flags >= 0 && (flags & O_NONBLOCK)) { |
| 8568 | flags &=~ O_NONBLOCK; | 8568 | flags &= ~O_NONBLOCK; |
| 8569 | if (fcntl(0, F_SETFL, flags) >= 0) { | 8569 | if (fcntl(0, F_SETFL, flags) >= 0) { |
| 8570 | out2str("sh: turning off NDELAY mode\n"); | 8570 | out2str("sh: turning off NDELAY mode\n"); |
| 8571 | goto retry; | 8571 | goto retry; |