From 2b6344872f1bdb24fa2cb87300f201fb3d19f39c Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Mon, 1 Nov 2004 01:48:35 +0000
Subject: [PATCH] Console fix (bug #2764) and logger fix...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
asterisk.c | 6 ++++--
logger.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/asterisk.c b/asterisk.c
index 1a0a6dfe3a..f74d0acb25 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -247,13 +247,15 @@ static void network_verboser(const char *s, int pos, int replace, int complete)
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);
}
}
diff --git a/logger.c b/logger.c
index 0fd0b2f291..390496834b 100755
--- a/logger.c
+++ b/logger.c
@@ -52,7 +52,7 @@ static char dateformat[256] = "%b %e %T"; /* Original Asterisk Format */
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;
--
GitLab