Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-03 00:31:16 +00:00
Code Issues Projects Releases Wiki Activity

lineedit: don't violate API if we do simple fgets

Browse Source 
ash: cosmetic style fixes, no code changes
This commit is contained in:
Denis Vlasenko 2007-12-09 10:03:28 +00:00
parent a96425fe82
commit 9cb220be9d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libbb/lineedit.c
View File

@ -1343,8 +1343,10 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
int len; int len;
parse_and_put_prompt(prompt); parse_and_put_prompt(prompt);
fflush(stdout); fflush(stdout);
fgets(command, maxsize, stdin); if (fgets(command, maxsize, stdin) == NULL)
len = strlen(command); len = -1; /* EOF or error */
else
len = strlen(command);
DEINIT_S(); DEINIT_S();
return len; return len;
} }

6
shell/ash.c
View File

@ -8553,7 +8553,7 @@ preadfd(void)
goto retry; goto retry;
} }
if (nr < 0 && errno == 0) { if (nr < 0 && errno == 0) {
/* Ctrl+D presend */ /* Ctrl+D pressed */
nr = 0; nr = 0;
} }
} }
@ -8564,8 +8564,8 @@ preadfd(void)
if (nr < 0) { if (nr < 0) {
if (parsefile->fd == 0 && errno == EWOULDBLOCK) { if (parsefile->fd == 0 && errno == EWOULDBLOCK) {
int flags = fcntl(0, F_GETFL); int flags = fcntl(0, F_GETFL);
if (flags >= 0 && flags & O_NONBLOCK) { if (flags >= 0 && (flags & O_NONBLOCK)) {
flags &=~ O_NONBLOCK; flags &= ~O_NONBLOCK;
if (fcntl(0, F_SETFL, flags) >= 0) { if (fcntl(0, F_SETFL, flags) >= 0) {
out2str("sh: turning off NDELAY mode\n"); out2str("sh: turning off NDELAY mode\n");
goto retry; goto retry;