Rocco Rutte:

[apps/madmutt.git] / lib.c

diff --git a/lib.c b/lib.c
index c5adcc3..e730022 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -32,6 +32,7 @@
 
 #include "lib/mem.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 extern short Umask;
 
@@ -104,7 +105,7 @@ int mutt_copy_bytes (FILE * in, FILE * out, size_t size)
     if ((chunk = fread (buf, 1, chunk, in)) < 1)
       break;
     if (fwrite (buf, 1, chunk, out) != chunk) {
-      /* dprint (1, (debugfile, "mutt_copy_bytes(): fwrite() returned short byte count\n")); */
+      debug_print (1, ("fwrite() returned short byte count\n"));
       return (-1);
     }
     size -= chunk;
@@ -154,7 +155,7 @@ int safe_symlink (const char *oldpath, const char *newpath)
     char abs_oldpath[_POSIX_PATH_MAX];
 
     if ((getcwd (abs_oldpath, sizeof abs_oldpath) == NULL) ||
-        (mutt_strlen (abs_oldpath) + 1 + mutt_strlen (oldpath) + 1 >
+        (safe_strlen (abs_oldpath) + 1 + safe_strlen (oldpath) + 1 >
          sizeof abs_oldpath))
       return -1;
 
@@ -250,7 +251,7 @@ int safe_open (const char *path, int flags)
   /* make sure the file is not symlink */
   if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
       compare_stat (&osb, &nsb) == -1) {
-/*    dprint (1, (debugfile, "safe_open(): %s is a symlink!\n", path)); */
+    debug_print (1, ("%s is a symlink!\n", path));
     close (fd);
     return (-1);
   }
@@ -415,7 +416,7 @@ char *mutt_concat_path (char *d, const char *dir, const char *fname, size_t l)
 {
   const char *fmt = "%s/%s";
 
-  if (!*fname || (*dir && dir[mutt_strlen (dir) - 1] == '/'))
+  if (!*fname || (*dir && dir[safe_strlen (dir) - 1] == '/'))
     fmt = "%s%s";
 
   snprintf (d, l, fmt, dir, fname);