[GRASS-SVN] r50634 - grass/branches/develbranch_6/lib/db/dbmi_base

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-02-02 04:46:17 -0800 (Thu, 02 Feb 2012)
New Revision: 50634

Modified:
   grass/branches/develbranch_6/lib/db/dbmi_base/dbmscap.c
Log:
revert r50633 which doesn't work on Windows


Modified: grass/branches/develbranch_6/lib/db/dbmi_base/dbmscap.c
===================================================================
--- grass/branches/develbranch_6/lib/db/dbmi_base/dbmscap.c	2012-02-02 12:27:44 UTC (rev 50633)
+++ grass/branches/develbranch_6/lib/db/dbmi_base/dbmscap.c	2012-02-02 12:46:17 UTC (rev 50634)
@@ -165,17 +165,19 @@
     while ((ent = readdir(dir))) {
 	char *name;
 
-	if ((strcmp(ent->d_name, ".") == 0) ||
-	    (strcmp(ent->d_name, "..") == 0))
+	if ((strcmp(ent->d_name, ".") == 0)
+	    || (strcmp(ent->d_name, "..") == 0))
 	    continue;
 
 #ifdef __MINGW32__
-	/* remove '.exe' from name (windows extension) */
-	name = G_str_replace(ent->d_name, ".exe", "");
-#else
-	name = G_store(ent->d_name);
+	/* skip manifest files on Windows */
+	if (G_strstr(ent->d_name, ".manifest"))
+	    continue;
 #endif
 
+	/* Remove '.exe' from name (windows extension) */
+	name = G_str_replace(ent->d_name, ".exe", "");
+
 #ifdef __MINGW32__
 	dirpath = G_malloc(strlen("\\driver\\db\\")
 			   + strlen(G_gisbase()) + strlen(ent->d_name) + 1);
@@ -184,9 +186,6 @@
 #else
 	G_asprintf(&dirpath, "%s/driver/db/%s", G_gisbase(), ent->d_name);
 #endif
-	if (access(dirpath, X_OK) != 0)
-	    continue;
-	
 	add_entry(&list, name, dirpath, "");
 	G_free(name);
 	G_free(dirpath);