From 9cb220be9dea5417c1ad0091bb7eeb1371891f89 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 9 Dec 2007 10:03:28 +0000 Subject: lineedit: don't violate API if we do simple fgets ash: cosmetic style fixes, no code changes --- shell/ash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index 9b9fe5b..4c8a289 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -8553,7 +8553,7 @@ preadfd(void) goto retry; } if (nr < 0 && errno == 0) { - /* Ctrl+D presend */ + /* Ctrl+D pressed */ nr = 0; } } @@ -8564,8 +8564,8 @@ preadfd(void) if (nr < 0) { if (parsefile->fd == 0 && errno == EWOULDBLOCK) { int flags = fcntl(0, F_GETFL); - if (flags >= 0 && flags & O_NONBLOCK) { - flags &=~ O_NONBLOCK; + if (flags >= 0 && (flags & O_NONBLOCK)) { + flags &= ~O_NONBLOCK; if (fcntl(0, F_SETFL, flags) >= 0) { out2str("sh: turning off NDELAY mode\n"); goto retry; -- cgit v1.1