automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@71370 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 11 deletions

diff --git a/asterisk.c b/asterisk.c
index 83c7ed2c2..111dcf53d 100644
--- 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 */