ncurses 6.1 - patch 20190914

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

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index b43aa9528a1e8bee44f93a7c46801506eaa8a716..b1d1e1ae8213adb17ac19e9f8cfee22054d61e23 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -48,7 +48,7 @@
 #include <locale.h>
 #endif
 
 #include <locale.h>
 #endif
 

-MODULE_ID("$Id: lib_setup.c,v 1.197 2018/11/24 22:13:16 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.204 2019/08/10 17:08:00 tom Exp $")

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *


@@ -446,23 +446,24 @@ _nc_update_screensize(SCREEN *sp)
     int old_cols = columns;
 #endif
 
     int old_cols = columns;
 #endif
 

-    TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);
-
-    /*
-     * See is_term_resized() and resizeterm().
-     * We're doing it this way because those functions belong to the upper
-     * ncurses library, while this resides in the lower terminfo library.
-     */
-    if (sp != 0 && sp->_resize != 0) {
-       if ((new_lines != old_lines) || (new_cols != old_cols)) {
-           sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
-       } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
-           sp->_ungetch(SP_PARM, KEY_RESIZE);  /* so application can know this */
+    if (sp != 0) {
+       TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);
+       /*
+        * See is_term_resized() and resizeterm().
+        * We're doing it this way because those functions belong to the upper
+        * ncurses library, while this resides in the lower terminfo library.
+        */
+       if (sp->_resize != 0) {
+           if ((new_lines != old_lines) || (new_cols != old_cols)) {
+               sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
+           } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
+               sp->_ungetch(SP_PARM, KEY_RESIZE);      /* so application can know this */
+           }
+           sp->_sig_winch = FALSE;

        }
        }

-       sp->_sig_winch = FALSE;

     }
 }
     }
 }

-#endif
+#endif /* USE_SIZECHANGE */

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *


@@ -628,6 +629,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 #endif
     TERMINAL *termp;
     SCREEN *sp = 0;
 #endif
     TERMINAL *termp;
     SCREEN *sp = 0;

+    char *myname;

     int code = ERR;
 
     START_TRACE();
     int code = ERR;
 
     START_TRACE();


@@ -656,14 +658,16 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 #endif
        }
     }
 #endif
        }
     }

+    myname = strdup(tname);

 
 

-    if (strlen(tname) > MAX_NAME_SIZE) {
+    if (strlen(myname) > MAX_NAME_SIZE) {

        ret_error(TGETENT_ERR,
                  "TERM environment must be <= %d characters.\n",
        ret_error(TGETENT_ERR,
                  "TERM environment must be <= %d characters.\n",

-                 MAX_NAME_SIZE);
+                 MAX_NAME_SIZE,
+                 free(myname));

     }
 
     }
 

-    T(("your terminal name is %s", tname));
+    T(("your terminal name is %s", myname));

 
     /*
      * Allow output redirection.  This is what SVr3 does.  If stdout is
 
     /*
      * Allow output redirection.  This is what SVr3 does.  If stdout is


@@ -692,8 +696,8 @@ TINFO_SETUP_TERM(TERMINAL **tp,
        && (termp != 0)
        && termp->Filedes == Filedes
        && termp->_termname != 0
        && (termp != 0)
        && termp->Filedes == Filedes
        && termp->_termname != 0

-       && !strcmp(termp->_termname, tname)
-       && _nc_name_match(TerminalType(termp).term_names, tname, "|")) {
+       && !strcmp(termp->_termname, myname)
+       && _nc_name_match(TerminalType(termp).term_names, myname, "|")) {

        T(("reusing existing terminal information and mode-settings"));
        code = OK;
 #ifdef USE_TERM_DRIVER
        T(("reusing existing terminal information and mode-settings"));
        code = OK;
 #ifdef USE_TERM_DRIVER


@@ -711,8 +715,9 @@ TINFO_SETUP_TERM(TERMINAL **tp,
        termp = typeCalloc(TERMINAL, 1);
 #endif
        if (termp == 0) {
        termp = typeCalloc(TERMINAL, 1);
 #endif
        if (termp == 0) {

-           ret_error0(TGETENT_ERR,
-                      "Not enough memory to create terminal structure.\n");
+           ret_error1(TGETENT_ERR,
+                      "Not enough memory to create terminal structure.\n",
+                      myname, free(myname));

        }
 #if HAVE_SYSCONF
        {
        }
 #if HAVE_SYSCONF
        {


@@ -735,17 +740,18 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 #ifdef USE_TERM_DRIVER
        INIT_TERM_DRIVER();
        TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 #ifdef USE_TERM_DRIVER
        INIT_TERM_DRIVER();
        TCB = (TERMINAL_CONTROL_BLOCK *) termp;

-       code = _nc_globals.term_driver(TCB, tname, errret);
+       code = _nc_globals.term_driver(TCB, myname, errret);

        if (code == OK) {
            termp->Filedes = (short) Filedes;
        if (code == OK) {
            termp->Filedes = (short) Filedes;

-           termp->_termname = strdup(tname);
+           termp->_termname = strdup(myname);

        } else {
        } else {

-           ret_error0(errret ? *errret : TGETENT_ERR,
-                      "Could not find any driver to handle this terminal.\n");
+           ret_error1(errret ? *errret : TGETENT_ERR,
+                      "Could not find any driver to handle terminal.\n",
+                      myname, free(myname));

        }
 #else
 #if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP
        }
 #else
 #if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP

-       status = _nc_setup_tinfo(tname, &TerminalType(termp));
+       status = _nc_setup_tinfo(myname, &TerminalType(termp));

        T(("_nc_setup_tinfo returns %d", status));
 #else
        T(("no database available"));
        T(("_nc_setup_tinfo returns %d", status));
 #else
        T(("no database available"));


@@ -754,11 +760,11 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 
        /* try fallback list if entry on disk */
        if (status != TGETENT_YES) {
 
        /* try fallback list if entry on disk */
        if (status != TGETENT_YES) {

-           const TERMTYPE2 *fallback = _nc_fallback2(tname);
+           const TERMTYPE2 *fallback = _nc_fallback2(myname);

 
            if (fallback) {
                T(("found fallback entry"));
 
            if (fallback) {
                T(("found fallback entry"));

-               TerminalType(termp) = *fallback;
+               _nc_copy_termtype2(&(TerminalType(termp)), fallback);

                status = TGETENT_YES;
            }
        }
                status = TGETENT_YES;
            }
        }


@@ -766,9 +772,13 @@ TINFO_SETUP_TERM(TERMINAL **tp,
        if (status != TGETENT_YES) {
            del_curterm(termp);
            if (status == TGETENT_ERR) {
        if (status != TGETENT_YES) {
            del_curterm(termp);
            if (status == TGETENT_ERR) {

+               free(myname);

                ret_error0(status, "terminals database is inaccessible\n");
            } else if (status == TGETENT_NO) {
                ret_error0(status, "terminals database is inaccessible\n");
            } else if (status == TGETENT_NO) {

-               ret_error1(status, "unknown terminal type.\n", tname);
+               ret_error1(status, "unknown terminal type.\n",
+                          myname, free(myname));
+           } else {
+               ret_error0(status, "unexpected return-code\n");

            }
        }
 #if NCURSES_EXT_NUMBERS
            }
        }
 #if NCURSES_EXT_NUMBERS


@@ -779,7 +789,7 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 #endif
 
        termp->Filedes = (short) Filedes;
 #endif
 
        termp->Filedes = (short) Filedes;

-       termp->_termname = strdup(tname);
+       termp->_termname = strdup(myname);

 
        set_curterm(termp);
 
 
        set_curterm(termp);
 


@@ -826,15 +836,19 @@ TINFO_SETUP_TERM(TERMINAL **tp,
        if ((VALID_STRING(cursor_address)
             || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
            && VALID_STRING(clear_screen)) {
        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);
+           ret_error1(TGETENT_YES, "terminal is not really generic.\n",
+                      myname, free(myname));

        } else {
            del_curterm(termp);
        } else {
            del_curterm(termp);

-           ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
+           ret_error1(TGETENT_NO, "I need something more specific.\n",
+                      myname, free(myname));

        }
     } else if (hard_copy) {
        }
     } else if (hard_copy) {

-       ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);
+       ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n",
+                  myname, free(myname));

     }
 #endif
     }
 #endif

+    free(myname);

     returnCode(code);
 }
 
     returnCode(code);
 }