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

diff --git a/dotlock.c b/dotlock.c
index eb4ba30..9df9848 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -1,20 +1,11 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1998-2000 Thomas Roessler <roessler@does-not-exist.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /*
@@ -64,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
 
@@ -135,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;
@@ -458,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);