[Asterisk-cvs] asterisk asterisk.c,1.127,1.128 logger.c,1.46,1.47

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv17496

Modified Files:
	asterisk.c logger.c 
Log Message:
Console fix (bug #2764) and logger fix...


Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- asterisk.c	5 Oct 2004 06:46:11 -0000	1.127
+++ asterisk.c	1 Nov 2004 01:48:35 -0000	1.128
@@ -247,13 +247,15 @@
 		char *t = alloca(strlen(s) + 2);
 		if (t) {
 			sprintf(t, "\r%s", s);
-			ast_network_puts(t);
+			if (complete)
+				ast_network_puts(t);
 		} else {
 			ast_log(LOG_ERROR, "Out of memory\n");
 			ast_network_puts(s);
 		}
 	} else {
-		ast_network_puts(s);
+		if (complete)
+			ast_network_puts(s);
 	}
 }
 

Index: logger.c
===================================================================
RCS file: /usr/cvsroot/asterisk/logger.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- logger.c	24 Oct 2004 06:12:21 -0000	1.46
+++ logger.c	1 Nov 2004 01:48:35 -0000	1.47
@@ -52,7 +52,7 @@
 AST_MUTEX_DEFINE_STATIC(msglist_lock);
 AST_MUTEX_DEFINE_STATIC(loglock);
 static int pending_logger_reload = 0;
-static int global_logmask = 0;
+static int global_logmask = -1;
 
 static struct msglist {
 	char *msg;