[svn-commits] tilghman: branch 1.4 r197194 - /branches/1.4/funcs/func_cut.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed May 27 14:09:42 2009
New Revision: 197194

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

Modified:
    branches/1.4/funcs/func_cut.c

Modified: branches/1.4/funcs/func_cut.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/funcs/func_cut.c?view=diff&rev=197194&r1=197193&r2=197194
==============================================================================
--- branches/1.4/funcs/func_cut.c (original)
+++ branches/1.4/funcs/func_cut.c Wed May 27 14:09:42 2009
@@ -167,7 +167,7 @@
 		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;
@@ -209,11 +209,12 @@
 					char *tmp3 = strsep(&tmp2, ds);
 					int curlen = strlen(buffer);
 
-					if (curlen)
+					if (firstfield) {
+						snprintf(buffer, buflen, "%s", tmp3);
+						firstfield = 0;
+					} else {
 						snprintf(buffer + curlen, buflen - curlen, "%c%s", d, tmp3);
-					else
-						snprintf(buffer, buflen, "%s", tmp3);
-
+					}
 					curfieldnum++;
 				}
 			}