diff options
| -rw-r--r-- | main/asterisk.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index d0c3d2e4e..0c36fda6a 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2282,9 +2282,6 @@ static void ast_remotecontrol(char * data) for (;;) { ebuf = (char *)el_gets(el, &num); - if (!ebuf) - break; - if (!ast_strlen_zero(ebuf)) { if (ebuf[strlen(ebuf)-1] == '\n') ebuf[strlen(ebuf)-1] = '\0'; @@ -2959,14 +2956,12 @@ int main(int argc, char *argv[]) for (;;) { buf = (char *)el_gets(el, &num); - if (!buf) - break; - - if (buf[strlen(buf)-1] == '\n') - buf[strlen(buf)-1] = '\0'; - consolehandler((char *)buf); + if (buf) { + if (buf[strlen(buf)-1] == '\n') + buf[strlen(buf)-1] = '\0'; - if (!buf && ast_opt_remote && (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n", + consolehandler((char *)buf); + } else if (ast_opt_remote && (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n", strlen("\nUse EXIT or QUIT to exit the asterisk console\n")) < 0)) { /* Whoa, stdout disappeared from under us... Make /dev/null's */ int fd; |