浏览代码

explain what needs to happen (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33670 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 16 年之前
父节点
当前提交
95d16144d4
共有 1 个文件被更改,包括 10 次插入2 次删除
  1. 10 2
      general/g.mremove/main.c

+ 10 - 2
general/g.mremove/main.c

@@ -103,6 +103,9 @@ int main(int argc, char *argv[])
     if (flag.regex->answer && flag.extended->answer)
     if (flag.regex->answer && flag.extended->answer)
 	G_fatal_error(_("-r and -e are mutually exclusive"));
 	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++) {
     for (n = 0; n < nlist; n++) {
 	o = opt[n];
 	o = opt[n];
 	G_free((char *)o->gisprompt);
 	G_free((char *)o->gisprompt);
@@ -123,8 +126,8 @@ int main(int argc, char *argv[])
 		    name = wc2regex(name);
 		    name = wc2regex(name);
 		if (regcomp(&regex, name,
 		if (regcomp(&regex, name,
 			    (flag.regex->answer ? 0 : REG_EXTENDED) | REG_NOSUB))
 			    (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);
 				  name);
 		if (!flag.regex->answer && !flag.extended->answer)
 		if (!flag.regex->answer && !flag.extended->answer)
 		    G_free(name);
 		    G_free(name);
@@ -150,6 +153,11 @@ int main(int argc, char *argv[])
 	}
 	}
     }
     }
 
 
+    if (!flag.force->answer) {
+	G_message(" ");
+	G_message(_("You must use the force flag to actually remove them. Exiting."));
+    }
+
     exit(result);
     exit(result);
 }
 }