ncurses 6.0 - patch 20160910

[ncurses.git] / progs / infocmp.c

diff --git a/progs/infocmp.c b/progs/infocmp.c
index 62773d634abc1e7c2ae9acfb64f0a8e94c0d77a8..ca5bbd45f80c5e40782d0e017f3abcbd268ecc11 100644 (file)
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2015,2016 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            *
@@ -42,7 +42,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.136 2015/09/05 15:49:57 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.137 2016/09/10 20:44:35 tom Exp $")
 
 #define L_CURL "{"
 #define R_CURL "}"
@@ -817,7 +817,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
                cp[0] != '\0' &&
                cp != cap) {
                len = strlen(cp);
-               (void) strncpy(buf2, sp, len);
+               _nc_STRNCPY(buf2, sp, len);
                buf2[len] = '\0';
 
                if (_nc_capcmp(cp, buf2))
@@ -873,7 +873,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
                        ? "ECMA+"
                        : "ECMA-"),
                       sizeof(buf2));
-           (void) strncpy(buf3, sp + csi, len);
+           _nc_STRNCPY(buf3, sp + csi, len);
            buf3[len] = '\0';
            len += (size_t) csi + 1;
 
@@ -894,7 +894,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
                        ? "DEC+"
                        : "DEC-"),
                       sizeof(buf2));
-           (void) strncpy(buf3, sp + csi + 1, len);
+           _nc_STRNCPY(buf3, sp + csi + 1, len);
            buf3[len] = '\0';
            len += (size_t) csi + 2;
 
@@ -910,7 +910,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
            && sp[next] == 'm') {
 
            _nc_STRCPY(buf2, "SGR:", sizeof(buf2));
-           (void) strncpy(buf3, sp + csi, len);
+           _nc_STRNCPY(buf3, sp + csi, len);
            buf3[len] = '\0';
            len += (size_t) csi + 1;
 
@@ -1861,8 +1861,8 @@ main(int argc, char *argv[])
                                   tname[0]);
                if (!quiet)
                    (void)
-                                 printf("#\tReconstructed via infocmp from file: %s\n",
-                                 tfile[0]);
+                       printf("#\tReconstructed via infocmp from file: %s\n",
+                              tfile[0]);
                dump_entry(&entries[0].tterm,
                           suppress_untranslatable,
                           limited,