ncurses 6.1 - patch 20190810

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

diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index d4257982f5c4f3cfd391440753346fa63aaf835c..7102a5f2a2761a62286dafd5152700badf5eee90 100644 (file)
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -41,7 +41,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: read_entry.c,v 1.153 2019/01/23 00:02:04 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.155 2019/07/20 20:23:11 tom Exp $")

 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 


@@ -552,7 +552,7 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr)
     int code;
 
     if (_nc_access(filename, R_OK) < 0
     int code;
 
     if (_nc_access(filename, R_OK) < 0

-       || (fp = fopen(filename, "rb")) == 0) {
+       || (fp = fopen(filename, BIN_R)) == 0) {

        TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
        code = TGETENT_NO;
     } else {
        TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
        code = TGETENT_NO;
     } else {


@@ -694,7 +694,7 @@ decode_quickdump(char *target, const char *source)
     char *base = target;
     int result = 0;
 
     char *base = target;
     int result = 0;
 

-    if (!strncmp(source, "b64:", 4)) {
+    if (!strncmp(source, "b64:", (size_t) 4)) {

        source += 4;
        while (*source != '\0') {
            int bits[4];
        source += 4;
        while (*source != '\0') {
            int bits[4];


@@ -712,7 +712,7 @@ decode_quickdump(char *target, const char *source)
                }
            }
        }
                }
            }
        }

-    } else if (!strncmp(source, "hex:", 4)) {
+    } else if (!strncmp(source, "hex:", (size_t) 4)) {

        source += 4;
        while (*source != '\0') {
            int ch = decode_hex(&source);
        source += 4;
        while (*source != '\0') {
            int ch = decode_hex(&source);