mirror of
https://github.com/sheumann/hush.git
synced 2024-08-20 04:28:57 +00:00
lineedit: don't violate API if we do simple fgets
ash: cosmetic style fixes, no code changes
This commit is contained in:
parent
a96425fe82
commit
9cb220be9d
@ -1343,8 +1343,10 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
|
||||
int len;
|
||||
parse_and_put_prompt(prompt);
|
||||
fflush(stdout);
|
||||
fgets(command, maxsize, stdin);
|
||||
len = strlen(command);
|
||||
if (fgets(command, maxsize, stdin) == NULL)
|
||||
len = -1; /* EOF or error */
|
||||
else
|
||||
len = strlen(command);
|
||||
DEINIT_S();
|
||||
return len;
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user