use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / lib.c

diff --git a/lib.c b/lib.c
index eee11e5..7c704b9 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -35,10 +35,10 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 
 #include "lib.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 extern short Umask;
@@ -218,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) ||
-        (str_len (abs_oldpath) + 1 + str_len (oldpath) + 1 >
+        (m_strlen(abs_oldpath) + 1 + m_strlen(oldpath) + 1 >
          sizeof abs_oldpath))
       return -1;
 
@@ -479,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[str_len (dir) - 1] == '/'))
+  if (!*fname || (*dir && dir[m_strlen(dir) - 1] == '/'))
     fmt = "%s%s";
 
   snprintf (d, l, fmt, dir, fname);