automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@71370 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/asterisk.c b/asterisk.c
index 83c7ed2c2b09cf837ac1b906e2478ef27284da5f..111dcf53d2270c8ffc087ee33b3d3dea40edb0c7 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -1816,9 +1816,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';
@@ -2460,15 +2457,12 @@ int main(int argc, char *argv[])
 
                for (;;) {
                        buf = (char *)el_gets(el, &num);
+                       if (buf) {
+                               if (buf[strlen(buf)-1] == '\n')
+                                       buf[strlen(buf)-1] = '\0';
 
-                       if (!buf)
-                               break;
-
-                       if (buf[strlen(buf)-1] == '\n')
-                               buf[strlen(buf)-1] = '\0';
-
-                       consolehandler((char *)buf);
-                       if (!buf && option_remote) {
+                               consolehandler((char *)buf);
+                       } else if (option_remote) {
                                if (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 */