ncurses 6.2 - patch 20210904

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

diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index eb1c172d5af5fdf8f76da9a14f2cf17827977340..c9696b70ae41f14b8174c99b2e3c88956a2c4305 100644 (file)
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <tic.h>
 
-MODULE_ID("$Id: read_termcap.c,v 1.99 2021/04/18 11:43:38 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.102 2021/09/04 10:29:15 tom Exp $")
 
 #if !PURE_TERMINFO
 
@@ -187,7 +187,7 @@ _nc_cgetcap(char *buf, const char *cap, int type)
     bp = buf;
     for (;;) {
        /*
-        * Skip past the current capability field - it's either the
+        * Skip past the current capability field - it is either the
         * name field if this is the first time through the loop, or
         * the remainder of a field whose name failed to match cap.
         */
@@ -803,7 +803,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
     /*
      * TERMCAP can have one of two things in it.  It can be the name of a file
      * to use instead of /etc/termcap.  In this case it better start with a
-     * "/".  Or it can be an entry to use so we don't have to read the file. 
+     * "/".  Or it can be an entry to use so we don't have to read the file.
      * In this case it has to already have the newlines crunched out.  If
      * TERMCAP does not hold a file name then a path of names is searched
      * instead.  The path is found in the TERMPATH variable, or becomes
@@ -1115,7 +1115,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 
        /*
         * We don't suppress warning messages here.  The presumption is
-        * that since it's just a single entry, they won't be a pain.
+        * that since it is just a single entry, they won't be a pain.
         */
        _nc_read_entry_source((FILE *) 0, tc_buf, FALSE, FALSE, NULLHOOK);
        free(tc_buf);
@@ -1126,7 +1126,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
 
            TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i]));
            if (_nc_access(termpaths[i], R_OK) == 0
-               && (fp = fopen(termpaths[i], "r")) != (FILE *) 0) {
+               && (fp = safe_fopen(termpaths[i], "r")) != (FILE *) 0) {
                _nc_set_source(termpaths[i]);
 
                /*
@@ -1166,7 +1166,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE2 *const tp)
                _nc_free_entry(_nc_head, &(ep->tterm));
 
                /*
-                * OK, now try to write the type to user's terminfo directory. 
+                * OK, now try to write the type to user's terminfo directory.
                 * Next time he loads this, it will come through terminfo.
                 *
                 * Advantage:  Second and subsequent fetches of this entry will