[GRASS-SVN] r30108 - in grass/branches/releasebranch_6_3: display/d.rast.edit lib/gis

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-02-13 01:28:58 -0500 (Wed, 13 Feb 2008)
New Revision: 30108

Modified:
   grass/branches/releasebranch_6_3/display/d.rast.edit/Makefile
   grass/branches/releasebranch_6_3/display/d.rast.edit/edit.h
   grass/branches/releasebranch_6_3/lib/gis/ask.c
Log:
use GNAME_MAX, GMAPSET_MAX ([old] d.rast.edit filename segfault); rename d.rast.edit.old incase you want to compile it manually

Modified: grass/branches/releasebranch_6_3/display/d.rast.edit/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/display/d.rast.edit/Makefile	2008-02-13 06:25:54 UTC (rev 30107)
+++ grass/branches/releasebranch_6_3/display/d.rast.edit/Makefile	2008-02-13 06:28:58 UTC (rev 30108)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-PGM = d.rast.edit
+PGM = d.rast.edit.old
 
 LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
 DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)

Modified: grass/branches/releasebranch_6_3/display/d.rast.edit/edit.h
===================================================================
--- grass/branches/releasebranch_6_3/display/d.rast.edit/edit.h	2008-02-13 06:25:54 UTC (rev 30107)
+++ grass/branches/releasebranch_6_3/display/d.rast.edit/edit.h	2008-02-13 06:28:58 UTC (rev 30108)
@@ -10,11 +10,11 @@
 #ifndef GLOBAL
 #define GLOBAL extern
 #endif
-GLOBAL char new_name[40], current_name[40], orig_name[40];
+GLOBAL char new_name[GNAME_MAX], current_name[GNAME_MAX], orig_name[GNAME_MAX];
 GLOBAL char grid_color_name[40];
 GLOBAL DCELL max_value, min_value;
 GLOBAL int cellsize;
-GLOBAL char user_mapset[40], current_mapset[40], orig_mapset[40];
+GLOBAL char user_mapset[GMAPSET_MAX], current_mapset[GMAPSET_MAX], orig_mapset[GMAPSET_MAX];
 GLOBAL struct Cell_head real_window;
 GLOBAL char *tempfile;
 GLOBAL struct Categories cats;

Modified: grass/branches/releasebranch_6_3/lib/gis/ask.c
===================================================================
--- grass/branches/releasebranch_6_3/lib/gis/ask.c	2008-02-13 06:25:54 UTC (rev 30107)
+++ grass/branches/releasebranch_6_3/lib/gis/ask.c	2008-02-13 06:28:58 UTC (rev 30108)
@@ -593,10 +593,10 @@
 
 static int parselist ( const char *input, int option, char *mapset)
 {
-    char list[30];
-    char f1[30];
-    char f2[30];
-    char f3[30];
+    char list[GNAME_MAX];
+    char f1[GMAPSET_MAX];
+    char f2[GMAPSET_MAX];
+    char f3[GMAPSET_MAX];
     int count;
 
     *list = *f1 = *f2 = 0;