[GRASS-SVN] r58046 - grass/trunk/lib/gis

[svn_grass at osgeo.org]

Author: glynn
Date: 2013-10-18 08:14:39 -0700 (Fri, 18 Oct 2013)
New Revision: 58046

Modified:
   grass/trunk/lib/gis/parser.c
Log:
Relax ambiguity check for option names, similar to r58034 for option values


Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c	2013-10-18 13:10:54 UTC (rev 58045)
+++ grass/trunk/lib/gis/parser.c	2013-10-18 15:14:39 UTC (rev 58046)
@@ -896,7 +896,8 @@
 {
     struct Option *at_opt = NULL;
     struct Option *opt = NULL;
-    int got_one;
+    int found;
+    int prefix;
     size_t key_len;
     char the_key[KEYLENGTH];
     char *ptr, *err;
@@ -909,35 +910,39 @@
     string++;
 
     /* Find option with best keyword match */
-    got_one = 0;
+    found = 0;
+    prefix = 0;
     key_len = strlen(the_key);
     for (at_opt = &st->first_option; at_opt; at_opt = at_opt->next_opt) {
 	if (!at_opt->key)
 	    continue;
 
-	if (!match_option(the_key, at_opt->key))
-	    continue;
+        if (strcmp(the_key, at_opt->key) == 0) {
+	    opt = at_opt;
+	    found = 1;
+	    break; 
+	}
 
-	got_one++;
-	opt = at_opt;
-
-	/* changed 1/15/91 -dpg   old code is in parser.old */
-	/* overide ambiguous check, if we get an exact match */
-	if (strlen(at_opt->key) == key_len) {
+        if (strncmp(the_key, at_opt->key, key_len) == 0) {
 	    opt = at_opt;
-	    got_one = 1;
-	    break;
+	    found++;
+	    prefix++;
 	}
+	else if (match_option(the_key, at_opt->key)) {
+	    if (!found)
+		opt = at_opt;
+	    found++;
+	}
     }
 
-    if (got_one > 1) {
+    if (found > 1 && prefix > 1) {
 	G_asprintf(&err, _("Sorry, <%s=> is ambiguous"), the_key);
 	append_error(err);
 	return;
     }
 
     /* If there is no match, complain */
-    if (got_one == 0) {
+    if (found == 0) {
 	G_asprintf(&err, _("Sorry, <%s> is not a valid parameter"), the_key);
 	append_error(err);
 	return;
@@ -1159,7 +1164,7 @@
 	    found++;
 	    prefix++;
 	}
-	if (match_option(ans, opts[i])) {
+	else if (match_option(ans, opts[i])) {
 	    if (!found)
 		*result = i;
 	    found++;