diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-20 22:06:01 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-20 22:06:01 +0000 |
| commit | 7ab9e5d4a90eecd60a375427643883854881e463 (patch) | |
| tree | edd9716af14295fc296db3869a1ed2d4ef60874e /main | |
| parent | d7038fd64d3b98ce3a0f216f3159154d75acc7dd (diff) | |
Merged revisions 124396 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r124396 | tilghman | 2008-06-20 17:04:37 -0500 (Fri, 20 Jun 2008) | 11 lines
Merged revisions 124395 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r124395 | tilghman | 2008-06-20 17:02:55 -0500 (Fri, 20 Jun 2008) | 3 lines
If the last character in a string to be parsed is the delimiter, then we should
count that final empty string as an additional argument.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124397 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/app.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/app.c b/main/app.c index 725bd1446..c0c9c0309 100644 --- a/main/app.c +++ b/main/app.c @@ -1012,7 +1012,7 @@ int ast_app_group_list_unlock(void) unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen) { int argc; - char *scan; + char *scan, *wasdelim = NULL; int paren = 0, quote = 0; if (!buf || !array || !arraylen) @@ -1039,14 +1039,18 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra /* Literal character, don't parse */ memmove(scan, scan + 1, strlen(scan)); } else if ((*scan == delim) && !paren && !quote) { + wasdelim = scan; *scan++ = '\0'; break; } } } - if (*scan) + /* If the last character in the original string was the delimiter, then + * there is one additional argument. */ + if (*scan || (scan > buf && (scan - 1) == wasdelim)) { array[argc++] = scan; + } return argc; } |