diff options
| author | Mark Spencer <markster@digium.com> | 2003-12-03 04:55:55 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2003-12-03 04:55:55 +0000 |
| commit | 4518e7d1f0617ca52ac6374bce9a239a7abba679 (patch) | |
| tree | 67ac3342c3a95f58468a8f22cb60850642552fd3 /asterisk.c | |
| parent | 1525d7f901b3829d48f9aaea3f5dd81a5fb2b328 (diff) | |
Revert bad patch in 187
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'asterisk.c')
| -rwxr-xr-x | asterisk.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/asterisk.c b/asterisk.c index 57724f897..37efe8029 100755 --- a/asterisk.c +++ b/asterisk.c @@ -167,7 +167,6 @@ static void *netconsole(void *vconsole) int res; int max; fd_set rfds; - struct timeval tv; if (gethostname(hostname, sizeof(hostname))) strncpy(hostname, "<Unknown>", sizeof(hostname)-1); @@ -180,17 +179,11 @@ static void *netconsole(void *vconsole) max = con->fd; if (con->p[0] > max) max = con->p[0]; - tv.tv_sec = 4; /* Wait max 4 sec for fds to become active */ - tv.tv_usec = 0; res = ast_select(max + 1, &rfds, NULL, NULL, NULL); if (res < 0) { ast_log(LOG_WARNING, "select returned < 0: %s\n", strerror(errno)); continue; } - if (res == 0) { - ast_log(LOG_WARNING, "Timeout on select.\n"); - break; - } if (FD_ISSET(con->fd, &rfds)) { res = read(con->fd, tmp, sizeof(tmp)); if (res < 1) { @@ -801,7 +794,7 @@ static int ast_el_read_char(EditLine *el, char *cp) if (!option_exec && !lastpos) write(STDOUT_FILENO, "\r", 1); write(STDOUT_FILENO, buf, res); - if ((buf[res-1] == '\n') && (buf[res-2] == '\n')) { + if ((buf[res-1] == '\n') || (buf[res-2] == '\n')) { *cp = CC_REFRESH; return(1); } else { |