ncurses 6.1 - patch 20180825

[ncurses.git] / progs / toe.c

diff --git a/progs/toe.c b/progs/toe.c
index 4924d2c1cccf32da6266f958d49c028aae7965a8..5abb46de1ea90875b9256a63e1ab79b298309933 100644 (file)
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2017 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            *


@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
 #include <hashed_db.h>
 #endif
 

-MODULE_ID("$Id: toe.c,v 1.68 2012/07/21 22:55:59 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.77 2017/12/23 19:23:40 tom Exp $")

 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 


@@ -99,6 +99,8 @@ new_termdata(void)
     if (want >= len_termdata) {
        len_termdata = (2 * want) + 10;
        ptr_termdata = typeRealloc(TERMDATA, len_termdata, ptr_termdata);
     if (want >= len_termdata) {
        len_termdata = (2 * want) + 10;
        ptr_termdata = typeRealloc(TERMDATA, len_termdata, ptr_termdata);

+       if (ptr_termdata == 0)
+           failed("ptr_termdata");

     }
 
     return ptr_termdata + use_termdata++;
     }
 
     return ptr_termdata + use_termdata++;


@@ -230,9 +232,9 @@ make_db_name(char *dst, const char *src, unsigned limit)
     static const char suffix[] = DBM_SUFFIX;
 
     bool result = FALSE;
     static const char suffix[] = DBM_SUFFIX;
 
     bool result = FALSE;

-    unsigned lens = sizeof(suffix) - 1;
-    unsigned size = strlen(src);
-    unsigned need = lens + size;
+    size_t lens = sizeof(suffix) - 1;
+    size_t size = strlen(src);
+    size_t need = lens + size;

 
     if (need <= limit) {
        if (size >= lens
 
     if (need <= limit) {
        if (size >= lens


@@ -250,22 +252,25 @@ make_db_name(char *dst, const char *src, unsigned limit)
 typedef void (DescHook) (int /* db_index */ ,
                         int /* db_limit */ ,
                         const char * /* term_name */ ,
 typedef void (DescHook) (int /* db_index */ ,
                         int /* db_limit */ ,
                         const char * /* term_name */ ,

-                        TERMTYPE * /* term */ );
+                        TERMTYPE2 * /* term */ );

 
 static const char *
 
 static const char *

-term_description(TERMTYPE *tp)
+term_description(TERMTYPE2 *tp)

 {
     const char *desc;
 
 {
     const char *desc;
 

-    if ((desc = strrchr(tp->term_names, '|')) == 0 || *++desc == '\0')
+    if (tp->term_names == 0
+       || (desc = strrchr(tp->term_names, '|')) == 0
+       || (*++desc == '\0')) {

        desc = "(No description)";
        desc = "(No description)";

+    }

 
     return desc;
 }
 
 /* display a description for the type */
 static void
 
     return desc;
 }
 
 /* display a description for the type */
 static void

-deschook(int db_index, int db_limit, const char *term_name, TERMTYPE *tp)
+deschook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp)

 {
     (void) db_index;
     (void) db_limit;
 {
     (void) db_index;
     (void) db_limit;


@@ -289,7 +294,7 @@ string_sum(const char *value)
 }
 
 static unsigned long
 }
 
 static unsigned long

-checksum_of(TERMTYPE *tp)
+checksum_of(TERMTYPE2 *tp)

 {
     unsigned long result = string_sum(tp->term_names);
     unsigned i;
 {
     unsigned long result = string_sum(tp->term_names);
     unsigned i;


@@ -308,7 +313,7 @@ checksum_of(TERMTYPE *tp)
 
 /* collect data, to sort before display */
 static void
 
 /* collect data, to sort before display */
 static void

-sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE *tp)
+sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE2 *tp)

 {
     TERMDATA *data = new_termdata();
 
 {
     TERMDATA *data = new_termdata();
 


@@ -318,11 +323,11 @@ sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE *tp)
     data->description = strmalloc(term_description(tp));
 }
 
     data->description = strmalloc(term_description(tp));
 }
 

-#if USE_TERMCAP
+#if NCURSES_USE_TERMCAP

 static void
 show_termcap(int db_index, int db_limit, char *buffer, DescHook hook)
 {
 static void
 show_termcap(int db_index, int db_limit, char *buffer, DescHook hook)
 {

-    TERMTYPE data;
+    TERMTYPE2 data;

     char *next = strchr(buffer, ':');
     char *last;
     char *list = buffer;
     char *next = strchr(buffer, ':');
     char *last;
     char *list = buffer;


@@ -345,7 +350,7 @@ show_termcap(int db_index, int db_limit, char *buffer, DescHook hook)
 }
 #endif
 
 }
 #endif
 

-#if USE_DATABASE
+#if NCURSES_USE_DATABASE

 static char *
 copy_entryname(DIRENT * src)
 {
 static char *
 copy_entryname(DIRENT * src)
 {


@@ -362,14 +367,14 @@ copy_entryname(DIRENT * src)
 
 static int
 typelist(int eargc, char *eargv[],
 
 static int
 typelist(int eargc, char *eargv[],

-        bool verbosity,
+        int verbosity,

         DescHook hook)
 /* apply a function to each entry in given terminfo directories */
 {
     int i;
 
     for (i = 0; i < eargc; i++) {
         DescHook hook)
 /* apply a function to each entry in given terminfo directories */
 {
     int i;
 
     for (i = 0; i < eargc; i++) {

-#if USE_DATABASE
+#if NCURSES_USE_DATABASE

        if (_nc_is_dir_path(eargv[i])) {
            char *cwd_buf = 0;
            DIR *termdir;
        if (_nc_is_dir_path(eargv[i])) {
            char *cwd_buf = 0;
            DIR *termdir;


@@ -419,7 +424,7 @@ typelist(int eargc, char *eargv[],
                }
                while ((entry = readdir(entrydir)) != 0) {
                    char *name_2;
                }
                while ((entry = readdir(entrydir)) != 0) {
                    char *name_2;

-                   TERMTYPE lterm;
+                   TERMTYPE2 lterm;

                    char *cn;
                    int status;
 
                    char *cn;
                    int status;
 


@@ -436,7 +441,7 @@ typelist(int eargc, char *eargv[],
                                       "%s: couldn't open terminfo file %s.\n",
                                       _nc_progname, name_2);
                        free(name_2);
                                       "%s: couldn't open terminfo file %s.\n",
                                       _nc_progname, name_2);
                        free(name_2);

-                       return (EXIT_FAILURE);
+                       continue;

                    }
 
                    /* only visit things once, by primary name */
                    }
 
                    /* only visit things once, by primary name */


@@ -445,7 +450,7 @@ typelist(int eargc, char *eargv[],
                        /* apply the selected hook function */
                        hook(i, eargc, cn, &lterm);
                    }
                        /* apply the selected hook function */
                        hook(i, eargc, cn, &lterm);
                    }

-                   _nc_free_termtype(&lterm);
+                   _nc_free_termtype2(&lterm);

                    free(name_2);
                }
                closedir(entrydir);
                    free(name_2);
                }
                closedir(entrydir);


@@ -470,7 +475,7 @@ typelist(int eargc, char *eargv[],
 
                    code = _nc_db_first(capdbp, &key, &data);
                    while (code == 0) {
 
                    code = _nc_db_first(capdbp, &key, &data);
                    while (code == 0) {

-                       TERMTYPE lterm;
+                       TERMTYPE2 lterm;

                        int used;
                        char *have;
                        char *cn;
                        int used;
                        char *have;
                        char *cn;


@@ -481,7 +486,7 @@ typelist(int eargc, char *eargv[],
                                cn = _nc_first_name(lterm.term_names);
                                /* apply the selected hook function */
                                hook(i, eargc, cn, &lterm);
                                cn = _nc_first_name(lterm.term_names);
                                /* apply the selected hook function */
                                hook(i, eargc, cn, &lterm);

-                               _nc_free_termtype(&lterm);
+                               _nc_free_termtype2(&lterm);

                            }
                        }
                        code = _nc_db_next(capdbp, &key, &data);
                            }
                        }
                        code = _nc_db_next(capdbp, &key, &data);


@@ -494,7 +499,7 @@ typelist(int eargc, char *eargv[],
        }
 #endif
 #endif
        }
 #endif
 #endif

-#if USE_TERMCAP
+#if NCURSES_USE_TERMCAP

 #if HAVE_BSD_CGETENT
        {
            CGETENT_CONST char *db_array[2];
 #if HAVE_BSD_CGETENT
        {
            CGETENT_CONST char *db_array[2];


@@ -702,6 +707,8 @@ main(int argc, char *argv[])
            }
            if (!pass) {
                eargv = allocArgv(count);
            }
            if (!pass) {
                eargv = allocArgv(count);

+               if (eargv == 0)
+                   failed("eargv");

            } else {
                code = typelist((int) count, eargv, header, hook);
                freeArgv(eargv);
            } else {
                code = typelist((int) count, eargv, header, hook);
                freeArgv(eargv);


@@ -711,9 +718,11 @@ main(int argc, char *argv[])
        DBDIRS state;
        int offset;
        const char *path;
        DBDIRS state;
        int offset;
        const char *path;

-       char **eargv = allocArgv(2);
+       char **eargv = allocArgv((size_t) 2);

        size_t count = 0;
 
        size_t count = 0;
 

+       if (eargv == 0)
+           failed("eargv");

        _nc_first_db(&state, &offset);
        if ((path = _nc_next_db(&state, &offset)) != 0) {
            eargv[count++] = strmalloc(path);
        _nc_first_db(&state, &offset);
        if ((path = _nc_next_db(&state, &offset)) != 0) {
            eargv[count++] = strmalloc(path);