exit str_cmp enters m_strcmp

[apps/madmutt.git] / lib.c

diff --git a/lib.c b/lib.c
index 096f57f..3212015 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -34,10 +34,11 @@
 #define EX_OK 0
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+
 #include "lib.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 extern short Umask;
@@ -147,7 +148,7 @@ void mutt_unlink (const char *s)
 
     if ((f = fdopen (fd, "r+"))) {
       unlink (s);
-      memset (buf, 0, sizeof (buf));
+      p_clear(buf, sizeof(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);
@@ -217,7 +218,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 >
+        (m_strlen(abs_oldpath) + 1 + m_strlen(oldpath) + 1 >
          sizeof abs_oldpath))
       return -1;
 
@@ -391,19 +392,19 @@ int mutt_rx_sanitize_string (char *dest, size_t destlen, const char *src)
  * If a line ends with "\", this char and the linefeed is removed,
  * and the next line is read too.
  */
-char *mutt_read_line (char *s, size_t * size, FILE * fp, int *line)
+char *mutt_read_line(char *s, size_t * size, FILE * fp, int *line)
 {
   size_t offset = 0;
   char *ch;
 
   if (!s) {
-    s = safe_malloc (STRING);
+    s = p_new(char, STRING);
     *size = STRING;
   }
 
   FOREVER {
     if (fgets (s + offset, *size - offset, fp) == NULL) {
-      FREE (&s);
+      p_delete(&s);
       return NULL;
     }
     if ((ch = strchr (s + offset, '\n')) != NULL) {
@@ -433,7 +434,7 @@ char *mutt_read_line (char *s, size_t * size, FILE * fp, int *line)
         /* There wasn't room for the line -- increase ``s'' */
         offset = *size - 1;     /* overwrite the terminating 0 */
         *size += STRING;
-        safe_realloc (&s, *size);
+        p_realloc(&s, *size);
       }
     }
   }
@@ -478,7 +479,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[m_strlen(dir) - 1] == '/'))
     fmt = "%s%s";
 
   snprintf (d, l, fmt, dir, fname);