Changeset 62389

Timestamp:

Oct 26, 2014, 1:23:32 PM (10 years ago)

Author:

mmetz

Message:

Vlib: fix r12350, sync Vect_check_input_output_name() to Vect_open_new()

File:

• grass/trunk/lib/vector/Vlib/legal_vname.c (modified) (6 diffs)

grass/trunk/lib/vector/Vlib/legal_vname.c

@@ -19 +19 @@
    \brief  Check if output is legal vector name.
 
-   Rule:  [A-Za-z][A-Za-z0-9_@]*
+   Rule:  [A-Za-z][A-Za-z0-9_]*
 
    Check also for SQL keywords.
@@ -26 +26 @@
 
    \return 1 OK
-   \return -1 if name does not start with letter A..Za..z or if name does not continue with A..Za..z0..9_@
+   \return -1 if name does not start with letter A..Za..z or if name does not continue with A..Za..z0..9_
  */
 
@@ -55 +55 @@
     for (s++; *s; s++)
         if (!((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z') ||
-              (*s >= '0' && *s <= '9') || *s == '_') || *s == '@') {
+              (*s >= '0' && *s <= '9') || *s == '_')) {
             G_warning(_("Illegal vector map name <%s>. Character '%c' not allowed."),
                       buf, *s);
@@ -91 +91 @@
 {
     const char *mapset;
-    char nm[GNAME_MAX], ms[GMAPSET_MAX];
+    char inm[GNAME_MAX], ims[GMAPSET_MAX];
+    char onm[GNAME_MAX], oms[GMAPSET_MAX];
+
+    /* check for fully-qualified map name */
+    if (G_name_is_fully_qualified(output, onm, oms)) {
+        if (strcmp(oms, G_mapset()) != 0) {
+            if (error == G_FATAL_EXIT) {
+                G_fatal_error(_("Output vector map name <%s> is not in the current mapset (%s)"),
+                              output, G_mapset());
+            }
+            else if (error == G_FATAL_PRINT) {
+                G_warning(_("Output vector map name <%s> is not in the current mapset (%s)"),
+                          output, G_mapset());
+                return 1;
+            }
+            else {                      /* GV_FATAL_RETURN */
+                return 1;
+            }
+        }
+        output = onm;
+    }
 
     if (Vect_legal_filename(output) == -1) {
         if (error == G_FATAL_EXIT) {
-            G_fatal_error(_("Output vector map name <%s> is not valid map name"),
+            G_fatal_error(_("Output vector map name <%s> is not SQL compliant"),
                           output);
         }
         else if (error == G_FATAL_PRINT) {
-            G_warning(_("Output vector map name <%s> is not valid map name"),
+            G_warning(_("Output vector map name <%s> is not SQL compliant"),
                       output);
             return 1;
@@ -108 +128 @@
     }
 
-    if (G_name_is_fully_qualified(input, nm, ms)) {
-        if (strcasecmp(ms, "ogr") != 0)
+    if (G_name_is_fully_qualified(input, inm, ims)) {
+        if (strcasecmp(ims, "ogr") != 0)
             mapset = G_find_vector2(input, "");
         else
-            mapset = ms;
+            mapset = ims;
     }
     else
@@ -131 +151 @@
 
     if (strcmp(mapset, G_mapset()) == 0) {
-        const char *in;
-
-        if (G_name_is_fully_qualified(input, nm, ms)) {
-            in = nm;
-        }
-        else {
-            in = input;
+        if (G_name_is_fully_qualified(input, inm, ims)) {
+            input = inm;
         }
 
-        if (strcmp(in, output) == 0) {
+        if (strcmp(input, output) == 0) {
             if (error == G_FATAL_EXIT) {
                 G_fatal_error(_("Output vector map <%s> is used as input"),