[asterisk-commits] tilghman: branch 1.6.0 r124397 - in /branches/1.6.0: ./ main/app.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jun 20 17:06:01 2008
New Revision: 124397

URL: http://svn.digium.com/view/asterisk?view=rev&rev=124397
Log:
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.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/app.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/app.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/app.c?view=diff&rev=124397&r1=124396&r2=124397
==============================================================================
--- branches/1.6.0/main/app.c (original)
+++ branches/1.6.0/main/app.c Fri Jun 20 17:06:01 2008
@@ -1012,7 +1012,7 @@
 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 @@
 				/* 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;
 }