ncurses 5.9 - patch 20141101

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

diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index f5ebb373e0fde1f842951c836f6b5e0c8ee0b320..fdfc4946ec721983e09f0518f83248ab878ce1eb 100644 (file)
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2013 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 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_termcap.c,v 1.74 2011/08/13 14:34:56 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.80 2013/06/08 16:48:47 tom Exp $")

 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;
 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;


@@ -63,6 +63,15 @@ NCURSES_EXPORT_VAR(char *) BC = 0;
 #define LAST_USE MyCache[CacheInx].last_used
 #define LAST_SEQ MyCache[CacheInx].sequence
 
 #define LAST_USE MyCache[CacheInx].last_used
 #define LAST_SEQ MyCache[CacheInx].sequence
 

+/*
+ * Termcap names are matched only using the first two bytes.
+ * Ignore any extended names longer than two bytes, to avoid problems
+ * with legacy code which passes in parameters whose use is long forgotten.
+ */
+#define ValidCap(cap) (((cap)[0] != '\0') && ((cap)[1] != '\0'))
+#define SameCap(a,b)  (((a)[0] == (b)[0]) && ((a)[1] == (b)[1]))
+#define ValidExt(ext) (ValidCap(ext) && (ext)[2] == '\0')
+

 /***************************************************************************
  *
  * tgetent(bufp, term)
 /***************************************************************************
  *
  * tgetent(bufp, term)


@@ -202,11 +211,13 @@ tgetent(char *bufp, const char *name)
 static bool
 same_tcname(const char *a, const char *b)
 {
 static bool
 same_tcname(const char *a, const char *b)
 {

-    fprintf(stderr, "compare(%s,%s)\n", a, b);
-    return !strncmp(a, b, 2);
+    bool code = SameCap(a, b);
+    fprintf(stderr, "compare(%s,%s) %s\n", a, b, code ? "same" : "diff");
+    return code;

 }
 }

+

 #else
 #else

-#define same_tcname(a,b) !strncmp(a,b,2)
+#define same_tcname(a,b) SameCap(a,b)

 #endif
 
 /***************************************************************************
 #endif
 
 /***************************************************************************


@@ -222,10 +233,10 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {
     int result = 0;            /* Solaris returns zero for missing flag */
 NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {
     int result = 0;            /* Solaris returns zero for missing flag */

-    int i, j;
+    int j = -1;

 
     T((T_CALLED("tgetflag(%p, %s)"), (void *) SP_PARM, id));
 
     T((T_CALLED("tgetflag(%p, %s)"), (void *) SP_PARM, id));

-    if (HasTInfoTerminal(SP_PARM)) {
+    if (HasTInfoTerminal(SP_PARM) && ValidCap(id)) {

        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
 
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
 


@@ -235,10 +246,10 @@ NCURSES_SP_NAME(tgetflag) (NCURSES_SP_DCLx NCURSES_CONST char *id)
        }
 #if NCURSES_XNAMES
        else {
        }
 #if NCURSES_XNAMES
        else {

-           j = -1;
+           int i;

            for_each_ext_boolean(i, tp) {
                const char *capname = ExtBoolname(tp, i, boolcodes);
            for_each_ext_boolean(i, tp) {
                const char *capname = ExtBoolname(tp, i, boolcodes);

-               if (same_tcname(id, capname)) {
+               if (same_tcname(id, capname) && ValidExt(capname)) {

                    j = i;
                    break;
                }
                    j = i;
                    break;
                }


@@ -274,10 +285,10 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {
     int result = ABSENT_NUMERIC;
 NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id)
 {
     int result = ABSENT_NUMERIC;

-    int i, j;
+    int j = -1;

 
     T((T_CALLED("tgetnum(%p, %s)"), (void *) SP_PARM, id));
 
     T((T_CALLED("tgetnum(%p, %s)"), (void *) SP_PARM, id));

-    if (HasTInfoTerminal(SP_PARM)) {
+    if (HasTInfoTerminal(SP_PARM) && ValidCap(id)) {

        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
 
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
 


@@ -287,10 +298,10 @@ NCURSES_SP_NAME(tgetnum) (NCURSES_SP_DCLx NCURSES_CONST char *id)
        }
 #if NCURSES_XNAMES
        else {
        }
 #if NCURSES_XNAMES
        else {

-           j = -1;
+           int i;

            for_each_ext_number(i, tp) {
                const char *capname = ExtNumname(tp, i, numcodes);
            for_each_ext_number(i, tp) {
                const char *capname = ExtNumname(tp, i, numcodes);

-               if (same_tcname(id, capname)) {
+               if (same_tcname(id, capname) && ValidExt(capname)) {

                    j = i;
                    break;
                }
                    j = i;
                    break;
                }


@@ -326,10 +337,10 @@ NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)
 {
     char *result = NULL;
 NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)
 {
     char *result = NULL;

-    int i, j;
+    int j = -1;

 
     T((T_CALLED("tgetstr(%s,%p)"), id, (void *) area));
 
     T((T_CALLED("tgetstr(%s,%p)"), id, (void *) area));

-    if (HasTInfoTerminal(SP_PARM)) {
+    if (HasTInfoTerminal(SP_PARM) && ValidCap(id)) {

        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
 
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
 


@@ -339,10 +350,10 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)
        }
 #if NCURSES_XNAMES
        else {
        }
 #if NCURSES_XNAMES
        else {

-           j = -1;
+           int i;

            for_each_ext_string(i, tp) {
                const char *capname = ExtStrname(tp, i, strcodes);
            for_each_ext_string(i, tp) {
                const char *capname = ExtStrname(tp, i, strcodes);

-               if (same_tcname(id, capname)) {
+               if (same_tcname(id, capname) && ValidExt(capname)) {

                    j = i;
                    break;
                }
                    j = i;
                    break;
                }


@@ -351,7 +362,7 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)
 #endif
        if (j >= 0) {
            result = tp->Strings[j];
 #endif
        if (j >= 0) {
            result = tp->Strings[j];

-           TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result)));
+           TR(TRACE_DATABASE, ("found match %d: %s", j, _nc_visbuf(result)));

            /* setupterm forces canceled strings to null */
            if (VALID_STRING(result)) {
                if (result == exit_attribute_mode
            /* setupterm forces canceled strings to null */
            if (VALID_STRING(result)) {
                if (result == exit_attribute_mode


@@ -361,7 +372,7 @@ NCURSES_SP_NAME(tgetstr) (NCURSES_SP_DCLx NCURSES_CONST char *id, char **area)
                }
                if (area != 0
                    && *area != 0) {
                }
                if (area != 0
                    && *area != 0) {

-                   (void) strcpy(*area, result);
+                   _nc_STRCPY(*area, result, 1024);

                    result = *area;
                    *area += strlen(*area) + 1;
                }
                    result = *area;
                    *area += strlen(*area) + 1;
                }