ncurses 5.9 - patch 20120414

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

diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index a14feedf282524db8944b0072d12fcb68c6cf7f8..0c992b66402e7ebe9bca5aa25f64c5524e7e5179 100644 (file)
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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            *
@@ -47,7 +47,7 @@
 #define TRACE_OUT(p)           /*nothing */
 #endif
 
-MODULE_ID("$Id: write_entry.c,v 1.80 2011/08/13 20:52:40 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.84 2012/02/22 22:40:24 tom Exp $")
 
 static int total_written;
 
@@ -70,7 +70,7 @@ write_file(char *filename, TERMTYPE *tp)
     DEBUG(1, ("Created %s", filename));
 
     if (write_object(tp, buffer, &offset, limit) == ERR
-       || fwrite(buffer, sizeof(char), offset, fp) != offset) {
+       || fwrite(buffer, sizeof(char), (size_t) offset, fp) != offset) {
        _nc_syserr_abort("error writing %s/%s", _nc_tic_dir(0), filename);
     }
 
@@ -99,7 +99,7 @@ check_writeable(int code)
     if (verified[s - dirnames])
        return;
 
-    sprintf(dir, LEAF_FMT, code);
+    _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);
     if (make_db_root(dir) < 0) {
        _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
     }
@@ -109,36 +109,35 @@ check_writeable(int code)
 #endif /* !USE_HASHED_DB */
 
 static int
-make_db_path(char *dst, const char *src, unsigned limit)
+make_db_path(char *dst, const char *src, size_t limit)
 {
     int rc = -1;
     const char *top = _nc_tic_dir(0);
 
     if (src == top || _nc_is_abs_path(src)) {
        if (strlen(src) + 1 <= limit) {
-           (void) strcpy(dst, src);
+           _nc_STRCPY(dst, src, limit);
            rc = 0;
        }
     } else {
        if (strlen(top) + strlen(src) + 2 <= limit) {
-           (void) sprintf(dst, "%s/%s", top, src);
+           _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src);
            rc = 0;
        }
     }
 #if USE_HASHED_DB
     if (rc == 0) {
-       if (_nc_is_dir_path(dst)) {
-           rc = -1;
-       } else {
-           static const char suffix[] = DBM_SUFFIX;
-           unsigned have = strlen(dst);
-           unsigned need = strlen(suffix);
-           if (have > need && strcmp(dst + have - need, suffix)) {
-               if (have + need <= limit)
-                   strcat(dst, suffix);
-               else
-                   rc = -1;
+       static const char suffix[] = DBM_SUFFIX;
+       size_t have = strlen(dst);
+       size_t need = strlen(suffix);
+       if (have > need && strcmp(dst + (int) (have - need), suffix)) {
+           if (have + need <= limit) {
+               _nc_STRCAT(dst, suffix, limit);
+           } else {
+               rc = -1;
            }
+       } else if (_nc_is_dir_path(dst)) {
+           rc = -1;
        }
     }
 #endif
@@ -158,10 +157,11 @@ make_db_root(const char *path)
 #if USE_HASHED_DB
        DB *capdbp;
 
-       if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL)
+       if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL) {
            rc = -1;
-       else if (_nc_db_close(capdbp) < 0)
+       } else if (_nc_db_close(capdbp) < 0) {
            rc = -1;
+       }
 #else
        struct stat statbuf;
 
@@ -277,7 +277,7 @@ _nc_write_entry(TERMTYPE *const tp)
     assert(strlen(tp->term_names) != 0);
     assert(strlen(tp->term_names) < sizeof(name_list));
 
-    (void) strcpy(name_list, tp->term_names);
+    _nc_STRCPY(name_list, tp->term_names, sizeof(name_list));
     DEBUG(7, ("Name list = '%s'", name_list));
 
     first_name = name_list;
@@ -330,7 +330,9 @@ _nc_write_entry(TERMTYPE *const tp)
            key.data = name_list;
            key.size = strlen(name_list);
 
-           strcpy(buffer + 1, tp->term_names);
+           _nc_STRCPY(buffer + 1,
+                      tp->term_names,
+                      sizeof(buffer) - 1);
            data.size = strlen(tp->term_names) + 1;
 
            _nc_db_put(capdb, &key, &data);
@@ -359,7 +361,8 @@ _nc_write_entry(TERMTYPE *const tp)
     if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN))
        _nc_warning("terminal name too long.");
 
-    sprintf(filename, LEAF_FMT "/%s", first_name[0], first_name);
+    _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename))
+               LEAF_FMT "/%s", first_name[0], first_name);
 
     /*
      * Has this primary name been written since the first call to
@@ -400,7 +403,8 @@ _nc_write_entry(TERMTYPE *const tp)
        }
 
        check_writeable(ptr[0]);
-       sprintf(linkname, LEAF_FMT "/%s", ptr[0], ptr);
+       _nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname))
+                   LEAF_FMT "/%s", ptr[0], ptr);
 
        if (strcmp(filename, linkname) == 0) {
            _nc_warning("self-synonym ignored");
@@ -415,7 +419,7 @@ _nc_write_entry(TERMTYPE *const tp)
            if (first_name[0] == linkname[0])
                strncpy(symlinkname, first_name, sizeof(symlinkname) - 1);
            else {
-               strcpy(symlinkname, "../");
+               _nc_STRCPY(symlinkname, "../", sizeof(suymlinkname));
                strncat(symlinkname, filename, sizeof(symlinkname) - 4);
            }
            symlinkname[sizeof(symlinkname) - 1] = '\0';
@@ -484,7 +488,7 @@ fake_write(char *dst,
     return (want / size);
 }
 
-#define Write(buf, size, count) fake_write(buffer, offset, limit, (char *) buf, count, size)
+#define Write(buf, size, count) fake_write(buffer, offset, (size_t) limit, (char *) buf, (size_t) count, (size_t) size)
 
 #undef LITTLE_ENDIAN           /* BSD/OS defines this as a feature macro */
 #define HI(x)                  ((x) / 256)
@@ -699,7 +703,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
            return (ERR);
 
        nextfree = compute_offsets(tp->Strings + STRCOUNT,
-                                  tp->ext_Strings,
+                                  (size_t) tp->ext_Strings,
                                   offsets);
        TRACE_OUT(("after extended string capabilities, nextfree=%d", nextfree));
 
@@ -707,7 +711,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
            return (ERR);
 
        nextfree += compute_offsets(tp->ext_Names,
-                                   extcnt,
+                                   (size_t) extcnt,
                                    offsets + tp->ext_Strings);
        TRACE_OUT(("after extended capnames, nextfree=%d", nextfree));
        strmax = tp->ext_Strings + extcnt;
@@ -735,7 +739,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 
        TRACE_OUT(("WRITE %d numbers @%d", tp->ext_Numbers, *offset));
        if (tp->ext_Numbers) {
-           convert_shorts(buf, tp->Numbers + NUMCOUNT, tp->ext_Numbers);
+           convert_shorts(buf, tp->Numbers + NUMCOUNT, (size_t) tp->ext_Numbers);
            if (Write(buf, 2, tp->ext_Numbers) != tp->ext_Numbers)
                return (ERR);
        }