Преглед изворни кода

revert https://trac.osgeo.org/grass/changeset/50632 which doesn't work on Windows

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50635 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa пре 13 година
родитељ
комит
71430720ad
1 измењених фајлова са 8 додато и 9 уклоњено
  1. 8 9
      lib/db/dbmi_base/dbmscap.c

+ 8 - 9
lib/db/dbmi_base/dbmscap.c

@@ -178,17 +178,19 @@ dbDbmscap *db_read_dbmscap(void)
     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);
@@ -197,9 +199,6 @@ dbDbmscap *db_read_dbmscap(void)
 #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);