Nico Golde:

[apps/madmutt.git] / lib.c

diff --git a/lib.c b/lib.c
index 96e3e65..1966fd6 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -1,23 +1,11 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1999-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.
  */
 
 /*
@@ -150,7 +138,7 @@ char *safe_strdup (const char *s)
 
   if (!s || !*s)
     return 0;
-  l = strlen (s) + 1;
+  l = mutt_strlen (s) + 1;
   p = (char *) safe_malloc (l);
   memcpy (p, s, l);
   return (p);
@@ -205,7 +193,7 @@ void mutt_str_adjust (char **p)
 {
   if (!p || !*p)
     return;
-  safe_realloc (p, strlen (*p) + 1);
+  safe_realloc (p, mutt_strlen (*p) + 1);
 }
 
 /* convert all characters in the string to lowercase */
@@ -319,7 +307,7 @@ int safe_symlink (const char *oldpath, const char *newpath)
     char abs_oldpath[_POSIX_PATH_MAX];
 
     if ((getcwd (abs_oldpath, sizeof abs_oldpath) == NULL) ||
-        (strlen (abs_oldpath) + 1 + strlen (oldpath) + 1 >
+        (mutt_strlen (abs_oldpath) + 1 + mutt_strlen (oldpath) + 1 >
          sizeof abs_oldpath))
       return -1;
 
@@ -562,7 +550,7 @@ char *mutt_substrdup (const char *begin, const char *end)
   if (end)
     len = end - begin;
   else
-    len = strlen (begin);
+    len = mutt_strlen (begin);
 
   p = safe_malloc (len + 1);
   memcpy (p, begin, len);
@@ -676,7 +664,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[strlen (dir) - 1] == '/'))
+  if (!*fname || (*dir && dir[mutt_strlen (dir) - 1] == '/'))
     fmt = "%s%s";
 
   snprintf (d, l, fmt, dir, fname);