ncurses 5.9 - patch 20131014

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index aa38840e7d9030a82f55070f5f7534b4b0be8c28..6ee1766604343a6f7b9b5e068bcc67b0622b34f4 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 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            *


@@ -46,7 +46,9 @@
 #include <hashed_db.h>
 #include <transform.h>
 
 #include <hashed_db.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.160 2012/02/05 01:39:39 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.188 2013/08/24 21:48:21 tom Exp $")
+
+#define STDIN_NAME "<stdin>"

 
 const char *_nc_progname = "tic";
 
 
 const char *_nc_progname = "tic";
 


@@ -55,6 +57,7 @@ static FILE *tmp_fp;
 static bool capdump = FALSE;   /* running as infotocap? */
 static bool infodump = FALSE;  /* running as captoinfo? */
 static bool showsummary = FALSE;
 static bool capdump = FALSE;   /* running as infotocap? */
 static bool infodump = FALSE;  /* running as captoinfo? */
 static bool showsummary = FALSE;

+static char **namelst = 0;

 static const char *to_remove;
 
 static void (*save_check_termtype) (TERMTYPE *, bool);
 static const char *to_remove;
 
 static void (*save_check_termtype) (TERMTYPE *, bool);


@@ -103,8 +106,10 @@ free_namelist(char **src)
 #endif
 
 static void
 #endif
 
 static void

-cleanup(char **namelst GCC_UNUSED)
+cleanup(void)

 {
 {

+    int rc;
+

 #if NO_LEAKS
     free_namelist(namelst);
 #endif
 #if NO_LEAKS
     free_namelist(namelst);
 #endif


@@ -112,10 +117,12 @@ cleanup(char **namelst GCC_UNUSED)
        fclose(tmp_fp);
     if (to_remove != 0) {
 #if HAVE_REMOVE
        fclose(tmp_fp);
     if (to_remove != 0) {
 #if HAVE_REMOVE

-       remove(to_remove);
+       rc = remove(to_remove);

 #else
 #else

-       unlink(to_remove);
+       rc = unlink(to_remove);

 #endif
 #endif

+       if (rc != 0)
+           perror(to_remove);

     }
 }
 
     }
 }
 


@@ -123,7 +130,6 @@ static void
 failed(const char *msg)
 {
     perror(msg);
 failed(const char *msg)
 {
     perror(msg);

-    cleanup((char **) 0);

     ExitProgram(EXIT_FAILURE);
 }
 
     ExitProgram(EXIT_FAILURE);
 }
 


@@ -222,7 +228,7 @@ write_it(ENTRY * ep)
            }
            *d = 0;
            if (strlen(result) < strlen(s))
            }
            *d = 0;
            if (strlen(result) < strlen(s))

-               strcpy(s, result);
+               _nc_STRCPY(s, result, strlen(s) + 1);

        }
     }
 
        }
     }
 


@@ -292,8 +298,10 @@ put_translate(int c)
     if (in_name) {
        if (used + 1 >= have) {
            have += 132;
     if (in_name) {
        if (used + 1 >= have) {
            have += 132;

-           namebuf = typeRealloc(char, have, namebuf);
-           suffix = typeRealloc(char, have, suffix);
+           if ((namebuf = typeRealloc(char, have, namebuf)) == 0)
+                 failed("put_translate namebuf");
+           if ((suffix = typeRealloc(char, have, suffix)) == 0)
+                 failed("put_translate suffix");

        }
        if (c == '\n' || c == '@') {
            namebuf[used++] = '\0';
        }
        if (c == '\n' || c == '@') {
            namebuf[used++] = '\0';


@@ -314,7 +322,7 @@ put_translate(int c)
            if ((up = strchr(namebuf, '#')) != 0
                || (up = strchr(namebuf, '=')) != 0
                || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) {
            if ((up = strchr(namebuf, '#')) != 0
                || (up = strchr(namebuf, '=')) != 0
                || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) {

-               (void) strcpy(suffix, up);
+               _nc_STRCPY(suffix, up, have);

                *up = '\0';
            }
 
                *up = '\0';
            }
 


@@ -365,19 +373,102 @@ stripped(char *src)
 }
 
 static FILE *
 }
 
 static FILE *

-open_input(const char *filename)
+open_tempfile(char *filename)
+{
+    FILE *result = 0;
+
+    _nc_STRCPY(filename, "/tmp/XXXXXX", PATH_MAX);
+#if HAVE_MKSTEMP
+    {
+       int oldmask = (int) umask(077);
+       int fd = mkstemp(filename);
+       if (fd >= 0)
+           result = fdopen(fd, "w");
+       umask((mode_t) oldmask);
+    }
+#else
+    if (tmpnam(filename) != 0)
+       result = fopen(filename, "w");
+#endif
+    return result;
+}
+
+static FILE *
+copy_input(FILE *source, const char *filename, char *alt_file)
+{
+    char my_altfile[PATH_MAX];
+    FILE *result = 0;
+    FILE *target = 0;
+    int ch;
+
+    if (alt_file == 0)
+       alt_file = my_altfile;
+
+    if (source == 0) {
+       failed("copy_input (source)");
+    } else if ((target = open_tempfile(alt_file)) == 0) {
+       failed("copy_input (target)");
+    } else {
+       clearerr(source);
+       for (;;) {
+           ch = fgetc(source);
+           if (feof(source)) {
+               break;
+           } else if (ferror(source)) {
+               failed(filename);
+           } else if (ch == 0) {
+               /* don't loop in case someone wants to convert /dev/zero */
+               fprintf(stderr, "%s: %s is not a text-file\n", _nc_progname, filename);
+               ExitProgram(EXIT_FAILURE);
+           }
+           fputc(ch, target);
+       }
+       fclose(source);
+       /*
+        * rewind() does not force the target file's data to disk (not does
+        * fflush()...).  So open a second stream on the data and then close
+        * the one that we were writing on before starting to read from the
+        * second stream.
+        */
+       result = fopen(alt_file, "r+");
+       fclose(target);
+       to_remove = strdup(alt_file);
+    }
+    return result;
+}
+
+static FILE *
+open_input(const char *filename, char *alt_file)

 {
 {

-    FILE *fp = fopen(filename, "r");
+    FILE *fp;

     struct stat sb;
     struct stat sb;

+    int mode;

 
 

-    if (fp == 0) {
-       fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename);
+    if (!strcmp(filename, "-")) {
+       fp = copy_input(stdin, STDIN_NAME, alt_file);
+    } else if (stat(filename, &sb) < 0) {
+       fprintf(stderr, "%s: %s %s\n", _nc_progname, filename, strerror(errno));

        ExitProgram(EXIT_FAILURE);
        ExitProgram(EXIT_FAILURE);

-    }
-    if (fstat(fileno(fp), &sb) < 0
-       || (sb.st_mode & S_IFMT) != S_IFREG) {
+    } else if ((mode = (sb.st_mode & S_IFMT)) == S_IFDIR
+              || (mode != S_IFREG && mode != S_IFCHR)) {

        fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
        ExitProgram(EXIT_FAILURE);
        fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
        ExitProgram(EXIT_FAILURE);

+    } else {
+       fp = fopen(filename, "r");
+
+       if (fp == 0) {
+           fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename);
+           ExitProgram(EXIT_FAILURE);
+       }
+       if (mode != S_IFREG) {
+           if (alt_file != 0) {
+               FILE *fp2 = copy_input(fp, filename, alt_file);
+               fp = fp2;
+           } else {
+               fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
+               ExitProgram(EXIT_FAILURE);
+           }
+       }

     }
     return fp;
 }
     }
     return fp;
 }


@@ -395,7 +486,7 @@ make_namelist(char *src)
     if (src == 0) {
        /* EMPTY */ ;
     } else if (strchr(src, '/') != 0) {                /* a filename */
     if (src == 0) {
        /* EMPTY */ ;
     } else if (strchr(src, '/') != 0) {                /* a filename */

-       FILE *fp = open_input(src);
+       FILE *fp = open_input(src, (char *) 0);

 
        for (pass = 1; pass <= 2; pass++) {
            nn = 0;
 
        for (pass = 1; pass <= 2; pass++) {
            nn = 0;


@@ -409,7 +500,8 @@ make_namelist(char *src)
                }
            }
            if (pass == 1) {
                }
            }
            if (pass == 1) {

-               dst = typeCalloc(char *, nn + 1);
+               if ((dst = typeCalloc(char *, nn + 1)) == 0)
+                     failed("make_namelist");

                rewind(fp);
            }
        }
                rewind(fp);
            }
        }


@@ -431,8 +523,10 @@ make_namelist(char *src)
                if (mark == '\0')
                    break;
            }
                if (mark == '\0')
                    break;
            }

-           if (pass == 1)
-               dst = typeCalloc(char *, nn + 1);
+           if (pass == 1) {
+               if ((dst = typeCalloc(char *, nn + 1)) == 0)
+                     failed("make_namelist");
+           }

        }
     }
     if (showsummary && (dst != 0)) {
        }
     }
     if (showsummary && (dst != 0)) {


@@ -462,22 +556,7 @@ matches(char **needle, const char *haystack)
     return (code);
 }
 
     return (code);
 }
 

-static FILE *
-open_tempfile(char *name)
-{
-    FILE *result = 0;
-#if HAVE_MKSTEMP
-    int fd = mkstemp(name);
-    if (fd >= 0)
-       result = fdopen(fd, "w");
-#else
-    if (tmpnam(name) != 0)
-       result = fopen(name, "w");
-#endif
-    return result;
-}
-
-static const char *
+static char *

 valid_db_path(const char *nominal)
 {
     struct stat sb;
 valid_db_path(const char *nominal)
 {
     struct stat sb;


@@ -486,9 +565,11 @@ valid_db_path(const char *nominal)
     size_t need = strlen(nominal) + sizeof(suffix);
     char *result = malloc(need);
 
     size_t need = strlen(nominal) + sizeof(suffix);
     char *result = malloc(need);
 

-    strcpy(result, nominal);
+    if (result == 0)
+       failed("valid_db_path");
+    _nc_STRCPY(result, nominal, need);

     if (strcmp(result + need - sizeof(suffix), suffix)) {
     if (strcmp(result + need - sizeof(suffix), suffix)) {

-       strcat(result, suffix);
+       _nc_STRCAT(result, suffix, need);

     }
 #else
     char *result = strdup(nominal);
     }
 #else
     char *result = strdup(nominal);


@@ -546,7 +627,7 @@ static void
 show_databases(const char *outdir)
 {
     bool specific = (outdir != 0) || getenv("TERMINFO") != 0;
 show_databases(const char *outdir)
 {
     bool specific = (outdir != 0) || getenv("TERMINFO") != 0;

-    const char *result;
+    char *result;

     const char *tried = 0;
 
     if (outdir == 0) {
     const char *tried = 0;
 
     if (outdir == 0) {


@@ -554,6 +635,7 @@ show_databases(const char *outdir)
     }
     if ((result = valid_db_path(outdir)) != 0) {
        printf("%s\n", result);
     }
     if ((result = valid_db_path(outdir)) != 0) {
        printf("%s\n", result);

+       free(result);

     } else {
        tried = outdir;
     }
     } else {
        tried = outdir;
     }


@@ -561,6 +643,7 @@ show_databases(const char *outdir)
     if ((outdir = _nc_home_terminfo())) {
        if ((result = valid_db_path(outdir)) != 0) {
            printf("%s\n", result);
     if ((outdir = _nc_home_terminfo())) {
        if ((result = valid_db_path(outdir)) != 0) {
            printf("%s\n", result);

+           free(result);

        } else if (!specific) {
            tried = outdir;
        }
        } else if (!specific) {
            tried = outdir;
        }


@@ -582,6 +665,7 @@ int
 main(int argc, char *argv[])
 {
     char my_tmpname[PATH_MAX];
 main(int argc, char *argv[])
 {
     char my_tmpname[PATH_MAX];

+    char my_altfile[PATH_MAX];

     int v_opt = -1;
     unsigned debug_level;
     int smart_defaults = TRUE;
     int v_opt = -1;
     unsigned debug_level;
     int smart_defaults = TRUE;


@@ -602,7 +686,6 @@ main(int argc, char *argv[])
     bool limited = TRUE;
     char *tversion = (char *) NULL;
     const char *source_file = "terminfo";
     bool limited = TRUE;
     char *tversion = (char *) NULL;
     const char *source_file = "terminfo";

-    char **namelst = 0;

     char *outdir = (char *) NULL;
     bool check_only = FALSE;
     bool suppress_untranslatable = FALSE;
     char *outdir = (char *) NULL;
     bool check_only = FALSE;
     bool suppress_untranslatable = FALSE;


@@ -610,6 +693,7 @@ main(int argc, char *argv[])
     log_fp = stderr;
 
     _nc_progname = _nc_rootname(argv[0]);
     log_fp = stderr;
 
     _nc_progname = _nc_rootname(argv[0]);

+    atexit(cleanup);

 
     if ((infodump = same_program(_nc_progname, PROG_CAPTOINFO)) != FALSE) {
        outform = F_TERMINFO;
 
     if ((infodump = same_program(_nc_progname, PROG_CAPTOINFO)) != FALSE) {
        outform = F_TERMINFO;


@@ -699,7 +783,6 @@ main(int argc, char *argv[])
            break;
        case 'V':
            puts(curses_version());
            break;
        case 'V':
            puts(curses_version());

-           cleanup(namelst);

            ExitProgram(EXIT_SUCCESS);
        case 'c':
            check_only = TRUE;
            ExitProgram(EXIT_SUCCESS);
        case 'c':
            check_only = TRUE;


@@ -771,7 +854,6 @@ main(int argc, char *argv[])
        (void) fprintf(stderr,
                       "%s: Sorry, -e can't be used without -I or -C\n",
                       _nc_progname);
        (void) fprintf(stderr,
                       "%s: Sorry, -e can't be used without -I or -C\n",
                       _nc_progname);

-       cleanup(namelst);

        ExitProgram(EXIT_FAILURE);
     }
 #endif /* HAVE_BIG_CORE */
        ExitProgram(EXIT_FAILURE);
     }
 #endif /* HAVE_BIG_CORE */


@@ -795,16 +877,16 @@ main(int argc, char *argv[])
                if (access(termcap, F_OK) == 0) {
                    /* file exists */
                    source_file = termcap;
                if (access(termcap, F_OK) == 0) {
                    /* file exists */
                    source_file = termcap;

-               } else if ((tmp_fp = open_tempfile(strcpy(my_tmpname,
-                                                         "/tmp/XXXXXX")))
-                          != 0) {
-                   source_file = my_tmpname;
-                   fprintf(tmp_fp, "%s\n", termcap);
-                   fclose(tmp_fp);
-                   tmp_fp = open_input(source_file);
-                   to_remove = source_file;

                } else {
                } else {

-                   failed("tmpnam");
+                   if ((tmp_fp = open_tempfile(my_tmpname)) != 0) {
+                       source_file = my_tmpname;
+                       fprintf(tmp_fp, "%s\n", termcap);
+                       fclose(tmp_fp);
+                       tmp_fp = open_input(source_file, (char *) 0);
+                       to_remove = source_file;
+                   } else {
+                       failed("tmpnam");
+                   }

                }
            }
        } else {
                }
            }
        } else {


@@ -814,24 +896,28 @@ main(int argc, char *argv[])
                    _nc_progname,
                    _nc_progname,
                    usage_string);
                    _nc_progname,
                    _nc_progname,
                    usage_string);

-           cleanup(namelst);

            ExitProgram(EXIT_FAILURE);
        }
     }
 
            ExitProgram(EXIT_FAILURE);
        }
     }
 

-    if (tmp_fp == 0)
-       tmp_fp = open_input(source_file);
+    if (tmp_fp == 0) {
+       tmp_fp = open_input(source_file, my_altfile);
+       if (!strcmp(source_file, "-")) {
+           source_file = STDIN_NAME;
+       }
+    }

 
 

-    if (infodump)
+    if (infodump) {

        dump_init(tversion,
                  smart_defaults
                  ? outform
                  : F_LITERAL,
                  sortmode, width, height, debug_level, formatted);
        dump_init(tversion,
                  smart_defaults
                  ? outform
                  : F_LITERAL,
                  sortmode, width, height, debug_level, formatted);

-    else if (capdump)
+    } else if (capdump) {

        dump_init(tversion,
                  outform,
                  sortmode, width, height, debug_level, FALSE);
        dump_init(tversion,
                  outform,
                  sortmode, width, height, debug_level, FALSE);

+    }

 
     /* parse entries out of the source file */
     _nc_set_source(source_file);
 
     /* parse entries out of the source file */
     _nc_set_source(source_file);


@@ -848,7 +934,6 @@ main(int argc, char *argv[])
     /* do use resolution */
     if (check_only || (!infodump && !capdump) || forceresolve) {
        if (!_nc_resolve_uses2(TRUE, literal) && !check_only) {
     /* do use resolution */
     if (check_only || (!infodump && !capdump) || forceresolve) {
        if (!_nc_resolve_uses2(TRUE, literal) && !check_only) {

-           cleanup(namelst);

            ExitProgram(EXIT_FAILURE);
        }
     }
            ExitProgram(EXIT_FAILURE);
        }
     }


@@ -943,7 +1028,6 @@ main(int argc, char *argv[])
        else
            fprintf(log_fp, "No entries written\n");
     }
        else
            fprintf(log_fp, "No entries written\n");
     }

-    cleanup(namelst);

     ExitProgram(EXIT_SUCCESS);
 }
 
     ExitProgram(EXIT_SUCCESS);
 }
 


@@ -1140,6 +1224,19 @@ check_ansi_cursor(char *list[4])
 }
 
 #define EXPECTED(name) if (!PRESENT(name)) _nc_warning("expected " #name)
 }
 
 #define EXPECTED(name) if (!PRESENT(name)) _nc_warning("expected " #name)

+#define UNEXPECTED(name) if (PRESENT(name)) _nc_warning("unexpected " #name ", for %s", why)
+
+static void
+check_noaddress(TERMTYPE *tp, const char *why)
+{
+    UNEXPECTED(column_address);
+    UNEXPECTED(cursor_address);
+    UNEXPECTED(cursor_home);
+    UNEXPECTED(cursor_mem_address);
+    UNEXPECTED(cursor_to_ll);
+    UNEXPECTED(row_address);
+    UNEXPECTED(row_address);
+}

 
 static void
 check_cursor(TERMTYPE *tp)
 
 static void
 check_cursor(TERMTYPE *tp)


@@ -1147,13 +1244,55 @@ check_cursor(TERMTYPE *tp)
     int count;
     char *list[4];
 
     int count;
     char *list[4];
 

+    if (hard_copy) {
+       check_noaddress(tp, "hard_copy");
+    } else if (generic_type) {
+       check_noaddress(tp, "generic_type");
+    } else if (strchr(tp->term_names, '+') == 0) {
+       int y = 0;
+       int x = 0;
+       if (PRESENT(column_address))
+           ++y;
+       if (PRESENT(cursor_address))
+           y = x = 10;
+       if (PRESENT(cursor_home))
+           ++y, ++x;
+       if (PRESENT(cursor_mem_address))
+           y = x = 10;
+       if (PRESENT(cursor_to_ll))
+           ++y, ++x;
+       if (PRESENT(row_address))
+           ++x;
+       if (PRESENT(cursor_down))
+           ++y;
+       if (PRESENT(cursor_up))
+           ++y;
+       if (PRESENT(cursor_left))
+           ++x;
+       if (PRESENT(cursor_right))
+           ++x;
+       if (x < 2 && y < 2) {
+           _nc_warning("terminal lacks cursor addressing");
+       } else {
+           if (x < 2)
+               _nc_warning("terminal lacks cursor column-addressing");
+           if (y < 2)
+               _nc_warning("terminal lacks cursor row-addressing");
+       }
+    }
+
+    /* it is rare to have an insert-line feature without a matching delete */
+    ANDMISSING(parm_insert_line, insert_line);
+    ANDMISSING(parm_delete_line, delete_line);
+    ANDMISSING(parm_insert_line, parm_delete_line);
+

     /* if we have a parameterized form, then the non-parameterized is easy */
     ANDMISSING(parm_down_cursor, cursor_down);
     ANDMISSING(parm_up_cursor, cursor_up);
     ANDMISSING(parm_left_cursor, cursor_left);
     ANDMISSING(parm_right_cursor, cursor_right);
 
     /* if we have a parameterized form, then the non-parameterized is easy */
     ANDMISSING(parm_down_cursor, cursor_down);
     ANDMISSING(parm_up_cursor, cursor_up);
     ANDMISSING(parm_left_cursor, cursor_left);
     ANDMISSING(parm_right_cursor, cursor_right);
 

-    /* Given any of a set of cursor movement, the whole set should be present. 
+    /* Given any of a set of cursor movement, the whole set should be present.

      * Technically this is not true (we could use cursor_address to fill in
      * unsupported controls), but it is likely.
      */
      * Technically this is not true (we could use cursor_address to fill in
      * unsupported controls), but it is likely.
      */


@@ -1281,19 +1420,19 @@ check_keypad(TERMTYPE *tp)
                assert(strlen(show) < (MAX_KP * 4));
                switch (kk) {
                case 0:
                assert(strlen(show) < (MAX_KP * 4));
                switch (kk) {
                case 0:

-                   strcat(show, " ka1");
+                   _nc_STRCAT(show, " ka1", sizeof(show));

                    break;
                case 1:
                    break;
                case 1:

-                   strcat(show, " ka3");
+                   _nc_STRCAT(show, " ka3", sizeof(show));

                    break;
                case 2:
                    break;
                case 2:

-                   strcat(show, " kb2");
+                   _nc_STRCAT(show, " kb2", sizeof(show));

                    break;
                case 3:
                    break;
                case 3:

-                   strcat(show, " kc1");
+                   _nc_STRCAT(show, " kc1", sizeof(show));

                    break;
                case 4:
                    break;
                case 4:

-                   strcat(show, " kc3");
+                   _nc_STRCAT(show, " kc3", sizeof(show));

                    break;
                }
            }
                    break;
                }
            }


@@ -1308,18 +1447,24 @@ check_keypad(TERMTYPE *tp)
               VALID_STRING(key_c3)) {
        show[0] = '\0';
        if (keypad_index(key_a1) >= 0)
               VALID_STRING(key_c3)) {
        show[0] = '\0';
        if (keypad_index(key_a1) >= 0)

-           strcat(show, " ka1");
+           _nc_STRCAT(show, " ka1", sizeof(show));

        if (keypad_index(key_a3) >= 0)
        if (keypad_index(key_a3) >= 0)

-           strcat(show, " ka3");
+           _nc_STRCAT(show, " ka3", sizeof(show));

        if (keypad_index(key_b2) >= 0)
        if (keypad_index(key_b2) >= 0)

-           strcat(show, " kb2");
+           _nc_STRCAT(show, " kb2", sizeof(show));

        if (keypad_index(key_c1) >= 0)
        if (keypad_index(key_c1) >= 0)

-           strcat(show, " kc1");
+           _nc_STRCAT(show, " kc1", sizeof(show));

        if (keypad_index(key_c3) >= 0)
        if (keypad_index(key_c3) >= 0)

-           strcat(show, " kc3");
+           _nc_STRCAT(show, " kc3", sizeof(show));

        if (*show != '\0')
            _nc_warning("vt100 keypad map incomplete:%s", show);
     }
        if (*show != '\0')
            _nc_warning("vt100 keypad map incomplete:%s", show);
     }

+
+    /*
+     * These warnings are useful for consistency checks - it is possible that
+     * there are real terminals with mismatches in these
+     */
+    ANDMISSING(key_ic, key_dc);

 }
 
 static void
 }
 
 static void


@@ -1348,6 +1493,74 @@ check_printer(TERMTYPE *tp)
     ANDMISSING(parm_up_micro, micro_up);
 }
 
     ANDMISSING(parm_up_micro, micro_up);
 }
 

+static bool
+uses_SGR_39_49(const char *value)
+{
+    return (strstr(value, "39;49") != 0
+           || strstr(value, "49;39") != 0);
+}
+
+/*
+ * Check consistency of termcap extensions related to "screen".
+ */
+static void
+check_screen(TERMTYPE *tp)
+{
+#if NCURSES_XNAMES
+    if (_nc_user_definable) {
+       int have_XT = tigetflag("XT");
+       int have_XM = tigetflag("XM");
+       int have_bce = back_color_erase;
+       bool have_kmouse = FALSE;
+       bool use_sgr_39_49 = FALSE;
+       char *name = _nc_first_name(tp->term_names);
+
+       if (!VALID_BOOLEAN(have_bce)) {
+           have_bce = FALSE;
+       }
+       if (!VALID_BOOLEAN(have_XM)) {
+           have_XM = FALSE;
+       }
+       if (!VALID_BOOLEAN(have_XT)) {
+           have_XT = FALSE;
+       }
+       if (VALID_STRING(key_mouse)) {
+           have_kmouse = !strcmp("\033[M", key_mouse);
+       }
+       if (VALID_STRING(orig_colors)) {
+           use_sgr_39_49 = uses_SGR_39_49(orig_colors);
+       } else if (VALID_STRING(orig_pair)) {
+           use_sgr_39_49 = uses_SGR_39_49(orig_pair);
+       }
+
+       if (have_XM && have_XT) {
+           _nc_warning("Screen's XT capability conflicts with XM");
+       } else if (have_XT
+                  && strstr(name, "screen") != 0
+                  && strchr(name, '.') != 0) {
+           _nc_warning("Screen's \"screen\" entries should not have XT set");
+       } else if (have_XT) {
+           if (!have_kmouse && have_bce) {
+               if (VALID_STRING(key_mouse)) {
+                   _nc_warning("Value of kmous inconsistent with screen's usage");
+               } else {
+                   _nc_warning("Expected kmous capability with XT");
+               }
+           }
+           if (!have_bce && max_colors > 0)
+               _nc_warning("Expected bce capability with XT");
+           if (!use_sgr_39_49 && have_bce && max_colors > 0)
+               _nc_warning("Expected orig_colors capability with XT to have 39/49 parameters");
+           if (VALID_STRING(to_status_line))
+               _nc_warning("\"tsl\" capability is redundant, given XT");
+       } else {
+           if (have_kmouse && !have_XM)
+               _nc_warning("Expected XT to be set, given kmous");
+       }
+    }
+#endif
+}
+

 /*
  * Returns the expected number of parameters for the given capability.
  */
 /*
  * Returns the expected number of parameters for the given capability.
  */


@@ -1659,7 +1872,7 @@ static void
 show_where(unsigned level)
 {
     if (_nc_tracing >= DEBUG_LEVEL(level)) {
 show_where(unsigned level)
 {
     if (_nc_tracing >= DEBUG_LEVEL(level)) {

-       char my_name[256];
+       char my_name[MAX_NAME_SIZE];

        _nc_get_type(my_name);
        _tracef("\"%s\", line %d, '%s'",
                _nc_get_source(),
        _nc_get_type(my_name);
        _tracef("\"%s\", line %d, '%s'",
                _nc_get_source(),


@@ -1671,6 +1884,58 @@ show_where(unsigned level)
 #define show_where(level)      /* nothing */
 #endif
 
 #define show_where(level)      /* nothing */
 #endif
 

+typedef struct {
+    int keycode;
+    const char *name;
+    const char *value;
+} NAME_VALUE;
+
+static NAME_VALUE *
+get_fkey_list(TERMTYPE *tp)
+{
+    NAME_VALUE *result = typeMalloc(NAME_VALUE, NUM_STRINGS(tp) + 1);
+    const struct tinfo_fkeys *all_fkeys = _nc_tinfo_fkeys;
+    int used = 0;
+    int j;
+
+    if (result == 0)
+       failed("get_fkey_list");
+
+    for (j = 0; all_fkeys[j].code; j++) {
+       char *a = tp->Strings[all_fkeys[j].offset];
+       if (VALID_STRING(a)) {
+           result[used].keycode = (int) all_fkeys[j].code;
+           result[used].name = strnames[all_fkeys[j].offset];
+           result[used].value = a;
+           ++used;
+       }
+    }
+#if NCURSES_XNAMES
+    for (j = STRCOUNT; j < NUM_STRINGS(tp); ++j) {
+       const char *name = ExtStrname(tp, j, strnames);
+       if (*name == 'k') {
+           result[used].keycode = -1;
+           result[used].name = name;
+           result[used].value = tp->Strings[j];
+           ++used;
+       }
+    }
+#endif
+    result[used].keycode = 0;
+    return result;
+}
+
+static void
+show_fkey_name(NAME_VALUE * data)
+{
+    if (data->keycode > 0) {
+       fprintf(stderr, " %s", keyname(data->keycode));
+       fprintf(stderr, " (capability \"%s\")", data->name);
+    } else {
+       fprintf(stderr, " capability \"%s\"", data->name);
+    }
+}
+

 /* other sanity-checks (things that we don't want in the normal
  * logic that reads a terminfo entry)
  */
 /* other sanity-checks (things that we don't want in the normal
  * logic that reads a terminfo entry)
  */


@@ -1679,7 +1944,6 @@ check_termtype(TERMTYPE *tp, bool literal)
 {
     bool conflict = FALSE;
     unsigned j, k;
 {
     bool conflict = FALSE;
     unsigned j, k;

-    char fkeys[STRCOUNT];

 
     /*
      * A terminal entry may contain more than one keycode assigned to
 
     /*
      * A terminal entry may contain more than one keycode assigned to


@@ -1687,41 +1951,47 @@ check_termtype(TERMTYPE *tp, bool literal)
      * return one (the last one assigned).
      */
     if (!(_nc_syntax == SYN_TERMCAP && capdump)) {
      * return one (the last one assigned).
      */
     if (!(_nc_syntax == SYN_TERMCAP && capdump)) {

-       memset(fkeys, 0, sizeof(fkeys));
-       for (j = 0; _nc_tinfo_fkeys[j].code; j++) {
-           char *a = tp->Strings[_nc_tinfo_fkeys[j].offset];
+       char *check = calloc((size_t) (NUM_STRINGS(tp) + 1), sizeof(char));
+       NAME_VALUE *given = get_fkey_list(tp);
+
+       if (check == 0)
+           failed("check_termtype");
+
+       for (j = 0; given[j].keycode; ++j) {
+           const char *a = given[j].value;

            bool first = TRUE;
            bool first = TRUE;

-           if (!VALID_STRING(a))
-               continue;
-           for (k = j + 1; _nc_tinfo_fkeys[k].code; k++) {
-               char *b = tp->Strings[_nc_tinfo_fkeys[k].offset];
-               if (!VALID_STRING(b)
-                   || fkeys[k])
+
+           for (k = j + 1; given[k].keycode; k++) {
+               const char *b = given[k].value;
+               if (check[k])

                    continue;
                if (!_nc_capcmp(a, b)) {
                    continue;
                if (!_nc_capcmp(a, b)) {

-                   fkeys[j] = 1;
-                   fkeys[k] = 1;
+                   check[j] = 1;
+                   check[k] = 1;

                    if (first) {
                        if (!conflict) {
                            _nc_warning("Conflicting key definitions (using the last)");
                            conflict = TRUE;
                        }
                    if (first) {
                        if (!conflict) {
                            _nc_warning("Conflicting key definitions (using the last)");
                            conflict = TRUE;
                        }

-                       fprintf(stderr, "... %s is the same as %s",
-                               keyname((int) _nc_tinfo_fkeys[j].code),
-                               keyname((int) _nc_tinfo_fkeys[k].code));
+                       fprintf(stderr, "...");
+                       show_fkey_name(given + j);
+                       fprintf(stderr, " is the same as");
+                       show_fkey_name(given + k);

                        first = FALSE;
                    } else {
                        first = FALSE;
                    } else {

-                       fprintf(stderr, ", %s",
-                               keyname((int) _nc_tinfo_fkeys[k].code));
+                       fprintf(stderr, ", ");
+                       show_fkey_name(given + k);

                    }
                }
            }
            if (!first)
                fprintf(stderr, "\n");
        }
                    }
                }
            }
            if (!first)
                fprintf(stderr, "\n");
        }

+       free(given);
+       free(check);

     }
 
     }
 

-    for (j = 0; j < NUM_STRINGS(tp); j++) {
+    for_each_string(j, tp) {

        char *a = tp->Strings[j];
        if (VALID_STRING(a))
            check_params(tp, ExtStrname(tp, (int) j, strnames), a);
        char *a = tp->Strings[j];
        if (VALID_STRING(a))
            check_params(tp, ExtStrname(tp, (int) j, strnames), a);


@@ -1732,6 +2002,7 @@ check_termtype(TERMTYPE *tp, bool literal)
     check_cursor(tp);
     check_keypad(tp);
     check_printer(tp);
     check_cursor(tp);
     check_keypad(tp);
     check_printer(tp);

+    check_screen(tp);

 
     /*
      * These may be mismatched because the terminal description relies on
 
     /*
      * These may be mismatched because the terminal description relies on