[GRASS-SVN] r31783 - grass/branches/develbranch_6/imagery/i.group

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Jun 21 08:31:25 EDT 2008


Author: neteler
Date: 2008-06-21 08:31:24 -0400 (Sat, 21 Jun 2008)
New Revision: 31783

Modified:
   grass/branches/develbranch_6/imagery/i.group/main.c
Log:
The string returned from G_mapset() must not be modified (merge from trunk)

Modified: grass/branches/develbranch_6/imagery/i.group/main.c
===================================================================
--- grass/branches/develbranch_6/imagery/i.group/main.c	2008-06-21 12:14:23 UTC (rev 31782)
+++ grass/branches/develbranch_6/imagery/i.group/main.c	2008-06-21 12:31:24 UTC (rev 31783)
@@ -280,7 +280,7 @@
 	    /* Parse out mapset */
 	    if (G__name_is_fully_qualified(rasters[n], xname, xmapset)) {
 		strcpy(tmp_name, xname);
-		strcpy(mapset, xmapset);
+		mapset = xmapset;
 	    }
 
 	    G_debug(3, "tmp_name %s, ref_tmp.file[%d].name: %s", tmp_name, m, ref_tmp.file[m].name);
@@ -335,7 +335,7 @@
 	    /* Parse out mapset */
 	    if (G__name_is_fully_qualified(rasters[n], xname, xmapset)) {
 		strcpy(tmp_name, xname);
-		strcpy(mapset, xmapset);
+                mapset = xmapset;
 	    }
 
 	    G_debug(3, "tmp_name %s, ref_tmp.file[%d].name: %s", tmp_name, m, ref_tmp.file[m].name);



More information about the grass-commit mailing list