X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=dotlock.c;h=9df9848f370f231ca877fb639a41ae3dceaa11b3;hp=4dea19687e372751ffcd077a2b0d1bbf17724042;hb=d9960a434f5c00a534a0dabe02ae5ab8d4881569;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/dotlock.c b/dotlock.c
index 4dea196..9df9848 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -55,7 +55,7 @@
 # define LONG_STRING 1024
 # define MAXLOCKATTEMPT 5
 
-# define strfcpy(A,B,C) strncpy (A,B,C), *(A+(C)-1)=0
+# define strfcpy(A,B,C)  m_strcpy(A,C,B)
 
 # ifdef USE_SETGID
 
@@ -126,7 +126,7 @@ static int dotlock_lock (const char *);
 
 #define check_flags(a) if (a & DL_FL_ACTIONS) usage (argv[0])
 
-size_t safe_strlen (const char* s) {
+size_t m_strlen(const char* s) {
   return (s ? strlen (s) : 0);
 }
 
@@ -453,7 +453,7 @@ static int dotlock_prepare (char *bn, size_t l, const char *f, int _fd)
     dirname = ".";
   }
 
-  if (safe_strlen (basename) + 1 > l)
+  if (m_strlen(basename) + 1 > l)
     return -1;
 
   strfcpy (bn, basename, l);