[GRASS-SVN] r46996 - grass/trunk/raster3d/r3.to.rast

[svn_grass at osgeo.org]

Author: huhabla
Date: 2011-07-05 05:17:44 -0700 (Tue, 05 Jul 2011)
New Revision: 46996

Modified:
   grass/trunk/raster3d/r3.to.rast/main.c
Log:
Check the overwrite flag

Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c	2011-07-05 12:12:23 UTC (rev 46995)
+++ grass/trunk/raster3d/r3.to.rast/main.c	2011-07-05 12:17:44 UTC (rev 46996)
@@ -197,6 +197,7 @@
     int i = 0, changemask = 0;
     int *fd = NULL, output_type, cols, rows;
     char *RasterFileName;
+    int overwrite = 0;
 
     /* Initialize GRASS */
     G_gisinit(argv[0]);
@@ -300,8 +301,10 @@
         G_asprintf(&RasterFileName, "%s_%05d", param.output->answer, i + 1);
         G_message(_("Raster map %i Filename: %s"), i + 1, RasterFileName);
 
-        if (G_find_raster2(RasterFileName, ""))
-            G_message(_("Raster map %d Filename: %s already exists. Will be overwritten!"),
+        overwrite = G_check_overwrite(argc, argv);
+        
+        if (G_find_raster2(RasterFileName, "") && !overwrite)
+            G_fatal_error(_("Raster map %d Filename: %s already exists. Use the flag --o to overwrite."),
                       i + 1, RasterFileName);
 
         if (output_type == FCELL_TYPE)