diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-27 19:29:48 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-27 19:29:48 +0000 |
commit | 4697a082d3149eb0e02524010520cbc3d715854a (patch) | |
tree | 4cf1d1409c0b033db43c96cd30b59bc1b0f762e0 | |
parent | bf042a94a8a20bcbee237db04507d9902a06c99d (diff) |
Recorded merge of revisions 197209 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r197209 | tilghman | 2009-05-27 14:20:56 -0500 (Wed, 27 May 2009) | 12 lines
Recorded merge of revisions 197194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r197194 | tilghman | 2009-05-27 14:09:42 -0500 (Wed, 27 May 2009) | 5 lines
Use a different determinator on whether to print the delimiter, since leading fields may be blank.
(closes issue #15208)
Reported by: ramonpeek
Patch by me, though inspired in part by a patch from ramonpeek
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@197244 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | funcs/func_cut.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/funcs/func_cut.c b/funcs/func_cut.c index 231729ddf..eace3ecd4 100644 --- a/funcs/func_cut.c +++ b/funcs/func_cut.c @@ -147,7 +147,7 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size pbx_substitute_variables_helper(chan, tmp, tmp2, MAXRESULT - 1); if (tmp2) { - int curfieldnum = 1; + int curfieldnum = 1, firstfield = 1; while (tmp2 != NULL && args.field != NULL) { char *nextgroup = strsep(&(args.field), "&"); int num1 = 0, num2 = MAXRESULT; @@ -189,10 +189,12 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size char *tmp3 = strsep(&tmp2, ds); int curlen = strlen(buffer); - if (curlen) - snprintf(buffer + curlen, buflen - curlen, "%c%s", d, tmp3); - else + if (firstfield) { snprintf(buffer, buflen, "%s", tmp3); + firstfield = 0; + } else { + snprintf(buffer + curlen, buflen - curlen, "%c%s", d, tmp3); + } curfieldnum++; } |