diff options
| -rw-r--r-- | main/asterisk.c | 38 | ||||
| -rw-r--r-- | main/logger.c | 8 |
2 files changed, 41 insertions, 5 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 05a3230c6..8b1cc7460 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1420,6 +1420,12 @@ static void __quit_handler(int num) static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp) { const char *c; + + /* Check for verboser preamble */ + if (*s == 127) { + s++; + } + if (!strncmp(s, cmp, strlen(cmp))) { c = s + strlen(cmp); term_color(outbuf, cmp, COLOR_GRAY, 0, maxout); @@ -1928,6 +1934,7 @@ static int ast_el_read_char(EditLine *el, char *cp) buf[res] = '\0'; + /* Write over the CLI prompt */ if (!ast_opt_exec && !lastpos) write(STDOUT_FILENO, "\r", 1); write(STDOUT_FILENO, buf, res); @@ -2425,13 +2432,38 @@ static void ast_remotecontrol(char * data) ast_el_read_history(filename); if (ast_opt_exec && data) { /* hack to print output then exit if asterisk -rx is used */ - char tempchar; struct pollfd fds; fds.fd = ast_consock; fds.events = POLLIN; fds.revents = 0; - while (poll(&fds, 1, 100) > 0) - ast_el_read_char(el, &tempchar); + while (poll(&fds, 1, 500) > 0) { + char buf[512] = "", *curline = buf, *nextline; + int not_written = 1; + + if (read(ast_consock, buf, sizeof(buf) - 1) < 0) { + break; + } + + do { + if ((nextline = strchr(curline, '\n'))) { + nextline++; + } else { + nextline = strchr(curline, '\0'); + } + + /* Skip verbose lines */ + if (*curline != 127) { + not_written = 0; + write(STDOUT_FILENO, curline, nextline - curline + (*nextline == '\0' ? 1 : 0)); + } + curline = nextline; + } while (!ast_strlen_zero(curline)); + + /* No non-verbose output in 500ms */ + if (not_written) { + break; + } + } return; } for (;;) { diff --git a/main/logger.c b/main/logger.c index dce2097d9..74fdda5df 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1176,8 +1176,12 @@ void ast_verbose(const char *fmt, ...) ast_localtime(&tv, &tm, NULL); ast_strftime(date, sizeof(date), dateformat, &tm); datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1); - sprintf(datefmt, "[%s] %s", date, fmt); + sprintf(datefmt, "%c[%s] %s", 127, date, fmt); fmt = datefmt; + } else { + char *tmp = alloca(strlen(fmt) + 2); + sprintf(tmp, "%c%s", 127, fmt); + fmt = tmp; } /* Build string */ @@ -1194,7 +1198,7 @@ void ast_verbose(const char *fmt, ...) strcpy(logmsg->str, buf->str); - ast_log(LOG_VERBOSE, "%s", logmsg->str); + ast_log(LOG_VERBOSE, "%s", logmsg->str + 1); /* Set type */ logmsg->type = LOGMSG_VERBOSE; |