kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 123710 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r123710 | tilghman | 2008-06-18 15:22:42 -0500 (Wed, 18 Jun 2008) | 7 lines

Set the variables top-down, so that if a script sets a variable more than once,
the last one will take precedence.
(closes issue #12673)
 Reported by: phber
 Patches: 
       20080519__bug12673.diff.txt uploaded by Corydon76 (license 14)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123715 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-18 20:23:58 +00:00
parent 8d353eb15a
commit c86e26e66b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pbx/pbx_spool.c
View File

@@ -109,7 +109,11 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
char buf[256]; char buf[256];
char *c, *c2; char *c, *c2;
int lineno = 0; 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)) { while(fgets(buf, sizeof(buf), f)) {
lineno++; lineno++;
@@ -205,8 +209,13 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
if (c2) { if (c2) {
var = ast_variable_new(c, c2, fn); var = ast_variable_new(c, c2, fn);
if (var) { if (var) {
var->next = o->vars; /* Always insert at the end, because some people want to treat the spool file as a script */
o->vars = var; if (last) {
last->next = var;
} else {
o->vars = var;
}
last = var;
} }
} else } else
ast_log(LOG_WARNING, "Malformed \"%s\" argument. Should be \"%s: variable=value\"\n", buf, buf); ast_log(LOG_WARNING, "Malformed \"%s\" argument. Should be \"%s: variable=value\"\n", buf, buf);