diff --git a/main/asterisk.c b/main/asterisk.c index ef6c64de67..e11ee26581 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2347,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)); diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index 8cf38a1165..9316971421 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -128,7 +128,11 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f) char buf[256]; char *c, *c2; int lineno = 0; - struct ast_variable *var; + struct ast_variable *var, *last = o->vars; + + while (last && last->next) { + last = last->next; + } while(fgets(buf, sizeof(buf), f)) { lineno++; @@ -222,8 +226,13 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f) if (c2) { var = ast_variable_new(c, c2); if (var) { - var->next = o->vars; - o->vars = var; + /* Always insert at the end, because some people want to treat the spool file as a script */ + if (last) { + last->next = var; + } else { + o->vars = var; + } + last = var; } } else ast_log(LOG_WARNING, "Malformed \"%s\" argument. Should be \"%s: variable=value\"\n", buf, buf);