diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-06-20 22:04:37 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-06-20 22:04:37 +0000 |
| commit | f5a6e39bf889cd541273d4a8a016748a3b0bd545 (patch) | |
| tree | 467a330aa0d836b194867df056196e4294c0d7bd /main/app.c | |
| parent | 3efcb3c79223ea4d9a850ddbeb3897ded3d03826 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@124396 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/app.c')
| -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 ebdd237b3..852e3b88e 100644 --- a/main/app.c +++ b/main/app.c @@ -1026,7 +1026,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) @@ -1053,14 +1053,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; } |