[GRASS-SVN] r31917 - grass/branches/develbranch_6/lib/gis

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Jul 1 04:16:45 EDT 2008


Author: neteler
Date: 2008-07-01 04:16:45 -0400 (Tue, 01 Jul 2008)
New Revision: 31917

Modified:
   grass/branches/develbranch_6/lib/gis/token.c
Log:
Don't skip field separators, even if they are whitespace (merge from trunk)

Modified: grass/branches/develbranch_6/lib/gis/token.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/token.c	2008-06-30 23:01:55 UTC (rev 31916)
+++ grass/branches/develbranch_6/lib/gis/token.c	2008-07-01 08:16:45 UTC (rev 31917)
@@ -36,7 +36,7 @@
 	char *p;
 
 	i = 0;
-	while (*buf == ' ' || *buf == '\t')  /* needed for G_free () */
+	while (!G_index(delim,*buf) && (*buf == ' ' || *buf == '\t'))  /* needed for G_free () */
 		buf++;
 
 	p = G_store (buf);
@@ -45,7 +45,7 @@
 
 	while (1)
 	{
-		while (*p == ' ' || *p == '\t')
+		while (!G_index(delim,*p) && (*p == ' ' || *p == '\t'))
 			p++;
 		if (*p == 0)
 			break;



More information about the grass-commit mailing list