ncurses 5.7 - patch 20101225

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

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 0b8aeba5a8cfa9ebc35115d1eed33040bf8d6d2e..378fd940d04fcf7fdecfe5bcd83c655993a830a0 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -51,7 +51,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.128 2010/04/03 13:54:45 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.132 2010/12/20 00:26:35 tom Exp $")
 
 /****************************************************************************
  *
@@ -430,14 +430,13 @@ _nc_update_screensize(SCREEN *sp)
                                            exit(EXIT_FAILURE);\
                                        }
 
-#ifndef USE_TERM_DRIVER
 #if USE_DATABASE || USE_TERMCAP
 /*
  * Return 1 if entry found, 0 if not found, -1 if database not accessible,
  * just like tgetent().
  */
-static int
-grab_entry(const char *const tn, TERMTYPE *const tp)
+int
+_nc_setup_tinfo(const char *const tn, TERMTYPE *const tp)
 {
     char filename[PATH_MAX];
     int status = _nc_read_entry(tn, filename, tp);
@@ -462,7 +461,6 @@ grab_entry(const char *const tn, TERMTYPE *const tp)
     return (status);
 }
 #endif
-#endif /* !USE_TERM_DRIVER */
 
 /*
 **     Take the real command character out of the CC environment variable
@@ -589,7 +587,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
 
 #ifdef USE_TERM_DRIVER
     T((T_CALLED("_nc_setupterm_ex(%p,%s,%d,%p)"),
-       tp, _nc_visbuf(tname), Filedes, errret));
+       (void *) tp, _nc_visbuf(tname), Filedes, (void *) errret));
 
     if (tp == 0) {
        ret_error0(TGETENT_ERR,
@@ -658,10 +656,11 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
                       "Not enough memory to create terminal structure.\n");
        }
 #ifdef USE_TERM_DRIVER
+       INIT_TERM_DRIVER();
        TCB = (TERMINAL_CONTROL_BLOCK *) termp;
        code = _nc_globals.term_driver(TCB, tname, errret);
        if (code == OK) {
-           termp->Filedes = Filedes;
+           termp->Filedes = (short) Filedes;
            termp->_termname = strdup(tname);
        } else {
            ret_error0(TGETENT_ERR,
@@ -669,7 +668,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
        }
 #else
 #if USE_DATABASE || USE_TERMCAP
-       status = grab_entry(tname, &termp->type);
+       status = _nc_setup_tinfo(tname, &termp->type);
 #else
        status = TGETENT_NO;
 #endif
@@ -697,7 +696,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
        ttytype[NAMESIZE - 1] = '\0';
 #endif
 
-       termp->Filedes = Filedes;
+       termp->Filedes = (short) Filedes;
        termp->_termname = strdup(tname);
 
        set_curterm(termp);