Importing files for 1.4.20.1 release

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.4.20.1@117627 65c4cc65-6c06-0410-ace0-fbb531ad65f3

.lastclean

@@ -0,0 +1 @@
+32

.version

@@ -0,0 +1 @@
+1.4.20.1

main/asterisk.c

@@ -1370,8 +1370,12 @@ static void console_verboser(const char *s)
 	    (c = fix_header(tmp, sizeof(tmp), s, VERBOSE_PREFIX_1))) {
 		fputs(tmp, stdout);
 		fputs(c, stdout);
-	} else
+	} else {
+		if (*s == 127) {
+			s++;
+		}
 		fputs(s, stdout);
+	}
 
 	fflush(stdout);
 	
@@ -2343,6 +2347,14 @@ static void ast_remotecontrol(char * data)
 			if (ebuf[strlen(ebuf)-1] == '\n')
 				ebuf[strlen(ebuf)-1] = '\0';
 			if (!remoteconsolehandler(ebuf)) {
+				/* Strip preamble from output */
+				char *tmp;
+				for (tmp = ebuf; *tmp; tmp++) {
+					if (*tmp == 127) {
+						memmove(tmp, tmp + 1, strlen(tmp));
+						tmp--;
+					}
+				}
 				res = write(ast_consock, ebuf, strlen(ebuf) + 1);
 				if (res < 1) {
 					ast_log(LOG_WARNING, "Unable to write: %s\n", strerror(errno));

pbx/pbx_gtkconsole.c

@@ -139,6 +139,10 @@ static void __verboser(const char *_stuff)
 
 static void verboser(const char *stuff) 
 {
+	if (*stuff == 127) {
+		stuff++;
+	}
+
 	ast_mutex_lock(&verb_lock);
 	/* Lock appropriately if we're really being called in verbose mode */
 	__verboser(stuff);