p_clear should not be used with sizeof but *countof*

[apps/madmutt.git] / lib-lib / file.c

diff --git a/lib-lib/file.c b/lib-lib/file.c
index 793ac10..7809db3 100644 (file)
--- a/lib-lib/file.c
+++ b/lib-lib/file.c
@@ -39,7 +39,6 @@
 #include "file.h"
 
 #include "../lib/debug.h"
-#include "../lib/str.h"
 
 #ifndef O_NOFOLLOW
 #  define O_NOFOLLOW  0
@@ -107,11 +106,11 @@ int safe_symlink(const char *oldpath, const char *newpath)
             return -1;
 
         len = m_strcat(abs_oldpath, sizeof(abs_oldpath), "/");
-        if (len >= sizeof(abs_oldpath))
+        if (len >= ssizeof(abs_oldpath))
             return -1;
 
         len += m_strcpy(abs_oldpath + len, sizeof(abs_oldpath) - len, oldpath);
-        if (len >= sizeof(abs_oldpath))
+        if (len >= ssizeof(abs_oldpath))
             return -1;
 
         if (symlink (abs_oldpath, newpath) < 0)
@@ -209,10 +208,10 @@ void mutt_unlink(const char *s)
             char buf[BUFSIZ];
             unlink(s);
 
-            p_clear(buf, sizeof(buf));
+            p_clear(buf, countof(buf));
             while (sb.st_size > 0) {
-                fwrite(buf, 1, MIN(sizeof(buf), sb.st_size), f);
-                sb.st_size -= MIN(sizeof(buf), sb.st_size);
+                fwrite(buf, 1, MIN(ssizeof(buf), sb.st_size), f);
+                sb.st_size -= MIN(ssizeof(buf), sb.st_size);
             }
             fclose (f);
         }
@@ -310,7 +309,7 @@ char *mutt_read_line(char *s, size_t *size, FILE * fp, int *line)
 int mutt_copy_stream(FILE *fin, FILE *fout)
 {
     char buf[BUFSIZ];
-    ssize_t l;
+    size_t l;
 
     while ((l = fread(buf, 1, sizeof (buf), fin)) > 0) {
         if (fwrite(buf, 1, l, fout) != l)
@@ -325,7 +324,7 @@ int mutt_copy_bytes(FILE *in, FILE *out, size_t size)
     char buf[BUFSIZ];
 
     while (size > 0) {
-        ssize_t chunk = MIN(size, sizeof(buf));
+        size_t chunk = MIN(size, sizeof(buf));
 
         if ((chunk = fread(buf, 1, chunk, in)) < 1)
             break;
@@ -354,12 +353,16 @@ const char *mutt_basename(const char *f)
 char *
 mutt_concat_path(char *d, ssize_t n, const char *dir, const char *fname)
 {
-    const char *fmt = "%s/%s";
+    int pos;
 
-    if (!*fname || (*dir && dir[m_strlen(dir) - 1] == '/'))
-        fmt = "%s%s";
+    pos = m_strcpy(d, n, dir);
+    if (pos >= n - 1)
+        return d;
 
-    snprintf(d, n, fmt, dir, fname);
+    if (pos && d[pos - 1] != '/')
+        d[pos++] = '/';
+
+    m_strcpy(d + pos, n - pos, fname);
     return d;
 }
 
@@ -385,7 +388,7 @@ void mutt_sanitize_filename(char *s, short slash)
 /* FIXME: API is very wrong */
 ssize_t mutt_quote_filename(char *d, ssize_t l, const char *s)
 {
-    size_t i, j = 0;
+    ssize_t i, j = 0;
 
     if (!s) {
         *d = '\0';