make code more readable.

[apps/madmutt.git] / dotlock.c

diff --git a/dotlock.c b/dotlock.c
index c076a4b..9df9848 100644 (file)
--- 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,6 +126,10 @@ static int dotlock_lock (const char *);
 
 #define check_flags(a) if (a & DL_FL_ACTIONS) usage (argv[0])
 
+size_t m_strlen(const char* s) {
+  return (s ? strlen (s) : 0);
+}
+
 int main (int argc, char **argv)
 {
   int i;
@@ -449,7 +453,7 @@ static int dotlock_prepare (char *bn, size_t l, const char *f, int _fd)
     dirname = ".";
   }
 
-  if (strlen (basename) + 1 > l)
+  if (m_strlen(basename) + 1 > l)
     return -1;
 
   strfcpy (bn, basename, l);