X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fdb_iterator.c;h=3a4827df04627c8d710bd6e0177f62e98322fa88;hp=74cffad3853653657cfa6c4d932645553f2d1371;hb=43bb25186a3fa2cc24c08b3a1eedbb1e860c59a9;hpb=2f5be2a67ca3f21100fd13e325b2986bb7b322bc

diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index 74cffad3..3a4827df 100644
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -43,7 +43,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: db_iterator.c,v 1.21 2011/11/19 18:13:34 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.26 2012/01/07 20:09:36 juergen Exp $")
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
@@ -60,7 +60,7 @@ add_to_blob(const char *text)
     if (*text != '\0') {
 	char *last = my_blob + strlen(my_blob);
 	if (last != my_blob)
-	    *last++ = ':';
+	    *last++ = NCURSES_PATHSEP;
 	strcpy(last, text);
     }
 }
@@ -69,20 +69,26 @@ static bool
 check_existence(const char *name, struct stat *sb)
 {
     bool result = FALSE;
-
-    if (stat(name, sb) == 0 && sb->st_size) {
+    if (stat(name, sb) == 0
+#ifndef __MINGW32__
+	&& sb->st_size
+#endif
+	) {
 	result = TRUE;
     }
 #if USE_HASHED_DB
     else if (strlen(name) < PATH_MAX - sizeof(DBM_SUFFIX)) {
 	char temp[PATH_MAX];
 	sprintf(temp, "%s%s", name, DBM_SUFFIX);
-	if (stat(temp, sb) == 0 && sb->st_size) {
+	if (stat(temp, sb) == 0
+#ifndef __MINGW32__
+	    && sb->st_size
+#endif
+	    ) {
 	    result = TRUE;
 	}
     }
 #endif
-
     return result;
 }
 
@@ -148,7 +154,7 @@ cache_expired(void)
 	result = TRUE;
     } else {
 	DBDIRS n;
-	for (n = 0; n < dbdLAST; ++n) {
+	for (n = (DBDIRS) 0; n < dbdLAST; ++n) {
 	    if (my_vars[n].name != 0
 		&& update_getenv(my_vars[n].name, n)) {
 		result = TRUE;
@@ -280,9 +286,15 @@ _nc_first_db(DBDIRS * state, int *offset)
 	    values[dbdHome] = _nc_home_terminfo();
 	    (void) cache_getenv("HOME", dbdHome);
 	    values[dbdEnvList] = cache_getenv("TERMINFO_DIRS", dbdEnvList);
+
 #endif
 #if USE_TERMCAP
 	    values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2);
+	    /* only use $TERMCAP if it is an absolute path */
+	    if (values[dbdEnvOnce2] != 0
+		&& *values[dbdEnvOnce2] != '/') {
+		values[dbdEnvOnce2] = 0;
+	    }
 	    values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2);
 #endif /* USE_TERMCAP */
 	}
@@ -305,7 +317,7 @@ _nc_first_db(DBDIRS * state, int *offset)
 	     */
 	    blobsize = 2;
 	    for (j = 0; my_blob[j] != '\0'; ++j) {
-		if (my_blob[j] == ':')
+		if (my_blob[j] == NCURSES_PATHSEP)
 		    ++blobsize;
 	    }
 	    my_list = typeCalloc(char *, blobsize);
@@ -314,7 +326,7 @@ _nc_first_db(DBDIRS * state, int *offset)
 		k = 0;
 		my_list[k++] = my_blob;
 		for (j = 0; my_blob[j] != '\0'; ++j) {
-		    if (my_blob[j] == ':') {
+		    if (my_blob[j] == NCURSES_PATHSEP) {
 			my_blob[j] = '\0';
 			my_list[k++] = &my_blob[j + 1];
 		    }
@@ -326,11 +338,11 @@ _nc_first_db(DBDIRS * state, int *offset)
 		for (j = 0; my_list[j] != 0; ++j) {
 #ifdef TERMINFO
 		    if (*my_list[j] == '\0')
-			my_list[j] = TERMINFO;
+			my_list[j] = strdup(TERMINFO);
 #endif
 		    for (k = 0; k < j; ++k) {
 			if (!strcmp(my_list[j], my_list[k])) {
-			    k = --j;
+			    k = j - 1;
 			    while ((my_list[j] = my_list[j + 1]) != 0) {
 				++j;
 			    }