diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-18 20:22:42 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-18 20:22:42 +0000 |
commit | c20fbf1367d5367110e8e63252f67b015cf88ed4 (patch) | |
tree | 02a18743d3ae3f96f19f4098503f5bf18935718f | |
parent | 7b4cc2dbc728a9f3ae0157c4422963b156a0bf54 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.4@123710 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | pbx/pbx_spool.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index 8cf38a116..931697142 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); |