|
|
| version 1.12.2.2, 2013/12/03 20:32:45 | version 1.13.4.1, 2014/04/29 01:21:44 |
|---|---|
| Line 1304 cliReadLine(linebuffer_t * __restrict cli_buffer, int | Line 1304 cliReadLine(linebuffer_t * __restrict cli_buffer, int |
| memset(buf, 0, sizeof buf); | memset(buf, 0, sizeof buf); |
| readLen = read(cli_buffer->line_in, buf, BUFSIZ); | readLen = read(cli_buffer->line_in, buf, BUFSIZ); |
| if (readLen == -1) { | if (readLen < 1) { |
| LOGERR; | if (readLen) |
| return str; | LOGERR; |
| return NULL; | |
| } | } |
| if (!readLen) { | |
| if (cli_buffer->line_buf) | |
| str = e_strdup(cli_buffer->line_buf); | |
| else | |
| cli_SetErr(EPIPE, "Unknown state ..."); | |
| return str; | |
| } | |
| recheck: | recheck: |
| for (code = RETCODE_OK, i = MAX_BINDKEY - 1; i > -1; i--) | for (code = RETCODE_OK, i = MAX_BINDKEY - 1; i > -1; i--) |
| Line 1446 cliNetLoop(linebuffer_t * __restrict cli_buffer, const | Line 1440 cliNetLoop(linebuffer_t * __restrict cli_buffer, const |
| if (FD_ISSET(pty, &fds)) { | if (FD_ISSET(pty, &fds)) { |
| memset(buf, 0, BUFSIZ); | memset(buf, 0, BUFSIZ); |
| if ((ret = read(pty, buf, BUFSIZ)) == -1) { | if ((ret = read(pty, buf, BUFSIZ)) < 1) { |
| LOGERR; | if (ret) |
| LOGERR; | |
| break; | break; |
| } | } |