ncurses 5.9 - patch 20120303

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

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 40af877b5dbe583c73017a785ecf0d8b183b9532..ab27eb1d8eb90f5719376bc3195de017ef392c6f 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -47,7 +47,7 @@
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.137 2011/05/21 17:35:14 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.143 2012/02/29 11:50:19 Werner.Fink Exp $")
 
 /****************************************************************************
  *
@@ -221,6 +221,7 @@ NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f)
 {
     T((T_CALLED("use_env(%p,%d)"), (void *) SP_PARM, (int) f));
 #if NCURSES_SP_FUNCS
+    START_TRACE();
     if (IsPreScreen(SP_PARM)) {
        SP_PARM->_use_env = f;
     }
@@ -235,6 +236,7 @@ NCURSES_EXPORT(void)
 use_env(bool f)
 {
     T((T_CALLED("use_env(%d)"), (int) f));
+    START_TRACE();
     _nc_prescreen.use_env = f;
     returnVoid;
 }
@@ -410,22 +412,6 @@ _nc_update_screensize(SCREEN *sp)
  *
  ****************************************************************************/
 
-#define ret_error(code, fmt, arg)      if (errret) {\
-                                           *errret = code;\
-                                           returnCode(ERR);\
-                                       } else {\
-                                           fprintf(stderr, fmt, arg);\
-                                           exit(EXIT_FAILURE);\
-                                       }
-
-#define ret_error0(code, msg)          if (errret) {\
-                                           *errret = code;\
-                                           returnCode(ERR);\
-                                       } else {\
-                                           fprintf(stderr, msg);\
-                                           exit(EXIT_FAILURE);\
-                                       }
-
 #if USE_DATABASE || USE_TERMCAP
 /*
  * Return 1 if entry found, 0 if not found, -1 if database not accessible,
@@ -463,7 +449,7 @@ _nc_setup_tinfo(const char *const tn, TERMTYPE *const tp)
 **     and substitute it in for the prototype given in 'command_character'.
 */
 void
-_nc_tinfo_cmdch(TERMINAL * termp, char proto)
+_nc_tinfo_cmdch(TERMINAL * termp, int proto)
 {
     unsigned i;
     char CC;
@@ -477,8 +463,8 @@ _nc_tinfo_cmdch(TERMINAL * termp, char proto)
     if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
        CC = *tmp;
        for_each_string(i, &(termp->type)) {
-           for (tmp = termp->type.Strings[i]; *tmp; tmp++) {
-               if (*tmp == proto)
+           for (tmp = termp->type.Strings[i]; tmp && *tmp; tmp++) {
+               if (UChar(*tmp) == proto)
                    *tmp = CC;
            }
        }
@@ -574,7 +560,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
                 NCURSES_CONST char *tname,
                 int Filedes,
                 int *errret,
-                bool reuse)
+                int reuse)
 {
 #ifdef USE_TERM_DRIVER
     TERMINAL_CONTROL_BLOCK *TCB = 0;
@@ -680,7 +666,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
            const TERMTYPE *fallback = _nc_fallback(tname);
 
            if (fallback) {
-               termp->type = *fallback;
+               _nc_copy_termtype(&(termp->type),fallback);
                status = TGETENT_YES;
            }
        }
@@ -690,11 +676,11 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
            if (status == TGETENT_ERR) {
                ret_error0(status, "terminals database is inaccessible\n");
            } else if (status == TGETENT_NO) {
-               ret_error(status, "'%s': unknown terminal type.\n", tname);
+               ret_error1(status, "unknown terminal type.\n", tname);
            }
        }
 #if !USE_REENTRANT
-       strncpy(ttytype, termp->type.term_names, NAMESIZE - 1);
+       strncpy(ttytype, termp->type.term_names, (size_t) (NAMESIZE - 1));
        ttytype[NAMESIZE - 1] = '\0';
 #endif
 
@@ -704,7 +690,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
        set_curterm(termp);
 
        if (command_character)
-           _nc_tinfo_cmdch(termp, *command_character);
+           _nc_tinfo_cmdch(termp, UChar(*command_character));
 
        /*
         * If an application calls setupterm() rather than initscr() or
@@ -738,10 +724,19 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
 
 #ifndef USE_TERM_DRIVER
     if (generic_type) {
-       ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
-    }
-    if (hard_copy) {
-       ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname);
+       /*
+        * BSD 4.3's termcap contains mis-typed "gn" for wy99.  Do a sanity
+        * check before giving up.
+        */
+       if ((VALID_STRING(cursor_address)
+            || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
+           && VALID_STRING(clear_screen)) {
+           ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
+       } else {
+           ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
+       }
+    } else if (hard_copy) {
+       ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);
     }
 #endif
     returnCode(code);
@@ -794,7 +789,7 @@ NCURSES_EXPORT(int)
 _nc_setupterm(NCURSES_CONST char *tname,
              int Filedes,
              int *errret,
-             bool reuse)
+             int reuse)
 {
     int res;
     TERMINAL *termp;