[GRASS-SVN] r33670 - grass/trunk/general/g.mremove

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-10-04 06:15:58 -0400 (Sat, 04 Oct 2008)
New Revision: 33670

Modified:
   grass/trunk/general/g.mremove/main.c
Log:
explain what needs to happen (merge from devbr6)

Modified: grass/trunk/general/g.mremove/main.c
===================================================================
--- grass/trunk/general/g.mremove/main.c	2008-10-04 10:13:51 UTC (rev 33669)
+++ grass/trunk/general/g.mremove/main.c	2008-10-04 10:15:58 UTC (rev 33670)
@@ -103,6 +103,9 @@
     if (flag.regex->answer && flag.extended->answer)
 	G_fatal_error(_("-r and -e are mutually exclusive"));
 
+    if (!flag.force->answer)
+	G_message(_("The following files would be deleted:"));
+
     for (n = 0; n < nlist; n++) {
 	o = opt[n];
 	G_free((char *)o->gisprompt);
@@ -123,8 +126,8 @@
 		    name = wc2regex(name);
 		if (regcomp(&regex, name,
 			    (flag.regex->answer ? 0 : REG_EXTENDED) | REG_NOSUB))
-		    G_fatal_error(_
-				  ("Unable to compile regular expression %s"),
+		    G_fatal_error(
+				  _("Unable to compile regular expression %s"),
 				  name);
 		if (!flag.regex->answer && !flag.extended->answer)
 		    G_free(name);
@@ -150,6 +153,11 @@
 	}
     }
 
+    if (!flag.force->answer) {
+	G_message(" ");
+	G_message(_("You must use the force flag to actually remove them. Exiting."));
+    }
+
     exit(result);
 }