Index: lib/gis/token.c
===================================================================
RCS file: /home/grass/grassrepository/grass6/lib/gis/token.c,v
retrieving revision 2.4
diff -u -r2.4 token.c
--- lib/gis/token.c	14 Apr 2007 23:02:01 -0000	2.4
+++ lib/gis/token.c	30 May 2007 13:19:12 -0000
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
 
-
 /**
  * \fn char **G_tokenize (char *buf, char *delim)
  *
@@ -31,36 +30,46 @@
 
 char **G_tokenize ( const char *buf, const char *delim)
 {
-	int i;
-	char **tokens;
-	char *p;
-
-	i = 0;
-	while (*buf == ' ' || *buf == '\t')  /* needed for G_free () */
-		buf++;
-
-	p = G_store (buf);
-
-	tokens = (char **) G_malloc (sizeof (char *));
-
-	while (1)
-	{
-		while (*p == ' ' || *p == '\t')
-			p++;
-		if (*p == 0)
-			break;
-		tokens[i++] = p;
-		tokens = (char **) G_realloc ((char *) tokens, (i+1) * sizeof (char *));
-
-		while (*p && (G_index(delim,*p) == NULL))
-			p++;
-		if (*p == 0)
-			break;
-		*p++ = 0;
+    int i;
+    char **tokens;
+    char *p, *delim_index;
+    
+    delim_index = NULL;
+    i = 0;
+    
+    while (*buf == ' ' || *buf == '\t')  /* needed for G_free () */
+	buf++;
+    
+    p = G_store (buf);
+    
+    tokens = (char **) G_malloc (sizeof (char *));
+    
+    while (1)
+    {
+	while (*p == ' ' || *p == '\t')
+	    p++;
+	
+	if (*p == 0 && !delim_index)
+	    break;
+	
+	tokens[i++] = p;
+	tokens = (char **) G_realloc ((char *) tokens, (i+1) * sizeof (char *));
+	
+	while (*p) {
+	    delim_index = G_index(delim,*p);
+	    if (delim_index)
+		break;
+	    p++;
 	}
-	tokens[i] = NULL;
-
-	return (tokens);
+	
+	if (*p == 0)
+	    break;
+	
+	*p++ = 0;
+    }
+    tokens[i] = NULL;
+    
+    return (tokens);
 }
 
 
@@ -74,17 +83,16 @@
  * \param[in] tokens
  * \return number of tokens
  */
-
 int G_number_of_tokens(char **tokens)
 {
-	int n;
-
-	for (n = 0; tokens[n] != NULL ; n++)
-        {
-         /* nothing */
-        }
-
-        return n;
+    int n;
+    
+    for (n = 0; tokens[n] != NULL; n++)
+    {
+	/* nothing */
+    }
+    
+    return n;
 }
 
 
@@ -105,6 +113,6 @@
     if (tokens[0] != NULL)
 	G_free (tokens[0]);
     G_free (tokens);
-
+    
     return (0);
 }