ncurses 5.9 - patch 20111217

[ncurses.git] / ncurses / tinfo / db_iterator.c

diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index 35185855d734517bb31105b336b045b9f1c2c3e9..0cf687644b4216b339789073a6f816a028362c37 100644 (file)
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -43,7 +43,7 @@
 #include <hashed_db.h>
 #endif
 
 #include <hashed_db.h>
 #endif
 

-MODULE_ID("$Id: db_iterator.c,v 1.20 2011/10/08 20:55:38 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.25 2011/12/17 21:30:20 tom Exp $")

 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory


@@ -148,7 +148,7 @@ cache_expired(void)
        result = TRUE;
     } else {
        DBDIRS n;
        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;
            if (my_vars[n].name != 0
                && update_getenv(my_vars[n].name, n)) {
                result = TRUE;


@@ -184,7 +184,7 @@ _nc_tic_dir(const char *path)
                return _nc_tic_dir(envp);
        }
     }
                return _nc_tic_dir(envp);
        }
     }

-    return TicDirectory;
+    return TicDirectory ? TicDirectory : TERMINFO;

 }
 
 /*
 }
 
 /*


@@ -283,6 +283,11 @@ _nc_first_db(DBDIRS * state, int *offset)
 #endif
 #if USE_TERMCAP
            values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2);
 #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 */
        }
            values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2);
 #endif /* USE_TERMCAP */
        }


@@ -326,11 +331,11 @@ _nc_first_db(DBDIRS * state, int *offset)
                for (j = 0; my_list[j] != 0; ++j) {
 #ifdef TERMINFO
                    if (*my_list[j] == '\0')
                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])) {
 #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;
                            }
                            while ((my_list[j] = my_list[j + 1]) != 0) {
                                ++j;
                            }