[GRASS-SVN] r33666 - grass/trunk/lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Oct 4 04:27:30 EDT 2008
Author: glynn
Date: 2008-10-04 04:27:30 -0400 (Sat, 04 Oct 2008)
New Revision: 33666
Modified:
grass/trunk/lib/gis/parser.c
Log:
Fix check_overwrite() to handle opt->multiple == YES
Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c 2008-10-04 07:03:48 UTC (rev 33665)
+++ grass/trunk/lib/gis/parser.c 2008-10-04 08:27:30 UTC (rev 33666)
@@ -2544,22 +2544,25 @@
split_gisprompt(opt->gisprompt, age, element, desc);
if (strcmp(age, "new") == 0) {
- if (G_find_file(element, opt->answer, G_mapset())) { /* found */
- if (!overwrite && !over) {
- if (G_info_format() != G_INFO_FORMAT_GUI) {
- fprintf(stderr,
- _("ERROR: option <%s>: <%s> exists.\n"),
- opt->key, opt->answer);
+ int i;
+ for (i = 0; opt->answers[i]; i++) {
+ if (G_find_file(element, opt->answers[i], G_mapset())) { /* found */
+ if (!overwrite && !over) {
+ if (G_info_format() != G_INFO_FORMAT_GUI) {
+ fprintf(stderr,
+ _("ERROR: option <%s>: <%s> exists.\n"),
+ opt->key, opt->answers[i]);
+ }
+ else {
+ fprintf(stderr,
+ "GRASS_INFO_ERROR(%d,1): option <%s>: <%s> exists.\n",
+ getpid(), opt->key, opt->answers[i]);
+ fprintf(stderr, "GRASS_INFO_END(%d,1)\n",
+ getpid());
+ }
+
+ error = 1;
}
- else {
- fprintf(stderr,
- "GRASS_INFO_ERROR(%d,1): option <%s>: <%s> exists.\n",
- getpid(), opt->key, opt->answer);
- fprintf(stderr, "GRASS_INFO_END(%d,1)\n",
- getpid());
- }
-
- error = 1;
}
}
}
More information about the grass-commit
mailing list