[asterisk-commits] russell: trunk r71365 - in /trunk: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: russell
Date: Sun Jun 24 15:07:15 2007
New Revision: 71365

URL: http://svn.digium.com/view/asterisk?view=rev&rev=71365
Log:
Merged revisions 71362 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r71362 | russell | 2007-06-24 15:06:31 -0500 (Sun, 24 Jun 2007) | 10 lines

Merged revisions 71358 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r71358 | russell | 2007-06-24 15:04:21 -0500 (Sun, 24 Jun 2007) | 2 lines

Revert the patch from issue 9654 due to an unexpected side effect

........

................

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=71365&r1=71364&r2=71365
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Sun Jun 24 15:07:15 2007
@@ -2232,9 +2232,6 @@
 	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';
@@ -2960,14 +2957,12 @@
 
 		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 && ast_opt_remote && (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n",
+			if (buf) {
+				if (buf[strlen(buf)-1] == '\n')
+					buf[strlen(buf)-1] = '\0';
+
+				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;