Bladeren bron

More restrictive test for option: [a-z0-9_]*[a-z0-9]
i.e. must consist solely of [a-z0-9_], and the last character may not be an underscore
[can we change 3dview= so that the first character must also be alphabetic?]


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33576 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements 16 jaren geleden
bovenliggende
commit
f308d0ebc6
1 gewijzigde bestanden met toevoegingen van 2 en 10 verwijderingen
  1. 2 10
      lib/gis/parser.c

+ 2 - 10
lib/gis/parser.c

@@ -2126,17 +2126,9 @@ static int contains(const char *s, int c)
 
 static int is_option(const char *string)
 {
-    const char *p = strchr(string, '=');
+    int n = strspn(string, "abcdefghijklmnopqrstuvwxyz0123456789_");
 
-    if (!p)
-	return 0;
-    if (p == string)
-	return 0;
-    p--;
-    if (!strchr("abcdefghijklmnopqrstuvwxyz0123456789", *p))
-	return 0;
-
-    return 1;
+    return n > 0 && string[n] == '=' && string[n-1] != '_';
 }
 
 static int set_option(char *string)