Nico Golde:

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 0b0530a..234efd2 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -86,7 +86,7 @@ void mutt_adv_mktemp (char *s, size_t l)
     mktemp (s);
     if (period != NULL) {
       *period = '.';
-      sl = safe_strlen (s);
+      sl = mutt_strlen (s);
       strfcpy (s + sl, period, l - sl);
     }
   }
@@ -276,7 +276,7 @@ void mutt_free_header (HEADER ** h)
 int mutt_matches_ignore (const char *s, LIST * t)
 {
   for (; t; t = t->next) {
-    if (!ascii_strncasecmp (s, t->data, safe_strlen (t->data))
+    if (!ascii_strncasecmp (s, t->data, mutt_strlen (t->data))
         || *t->data == '*')
       return 1;
   }
@@ -364,7 +364,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
 #ifdef USE_IMAP
         /* if folder = imap[s]://host/: don't append slash */
         if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP && 
-            Maildir[safe_strlen (Maildir) - 1] == '/')
+            Maildir[mutt_strlen (Maildir) - 1] == '/')
           strfcpy (p, NONULL (Maildir), sizeof (p));
         else
 #endif
@@ -489,7 +489,7 @@ char *mutt_gecos_name (char *dest, size_t destlen, struct passwd *pw)
   else
     strfcpy (dest, pw->pw_gecos, destlen);
 
-  pwnl = safe_strlen (pw->pw_name);
+  pwnl = mutt_strlen (pw->pw_name);
 
   for (idx = 0; dest[idx]; idx++) {
     if (dest[idx] == '&') {
@@ -701,15 +701,15 @@ void mutt_pretty_mailbox (char *s)
   }
   *q = 0;
 
-  if (safe_strncmp (s, Maildir, (len = safe_strlen (Maildir))) == 0 &&
+  if (safe_strncmp (s, Maildir, (len = mutt_strlen (Maildir))) == 0 &&
       s[len] == '/') {
     *s++ = '=';
-    memmove (s, s + len, safe_strlen (s + len) + 1);
+    memmove (s, s + len, mutt_strlen (s + len) + 1);
   }
-  else if (safe_strncmp (s, Homedir, (len = safe_strlen (Homedir))) == 0 &&
+  else if (safe_strncmp (s, Homedir, (len = mutt_strlen (Homedir))) == 0 &&
            s[len] == '/') {
     *s++ = '~';
-    memmove (s, s + len - 1, safe_strlen (s + len - 1) + 1);
+    memmove (s, s + len - 1, mutt_strlen (s + len - 1) + 1);
   }
 }
 
@@ -749,7 +749,7 @@ void mutt_expand_fmt (char *dest, size_t destlen, const char *fmt,
   size_t slen;
   int found = 0;
 
-  slen = safe_strlen (src);
+  slen = mutt_strlen (src);
   destlen--;
 
   for (p = fmt, d = dest; destlen && *p; p++) {
@@ -901,7 +901,7 @@ int mutt_skipchars (const char *s, const char *c)
     ret++;
     s++;
   }
-  return (safe_strlen (p));
+  return (mutt_strlen (p));
 }
 
 void mutt_FormatString (char *dest,     /* output buffer */
@@ -1001,7 +1001,7 @@ void mutt_FormatString (char *dest,     /* output buffer */
         if (count > col) {
           count -= col;         /* how many columns left on this line */
           mutt_FormatString (buf, sizeof (buf), src, callback, data, flags);
-          wid = safe_strlen (buf);
+          wid = mutt_strlen (buf);
           if (count > wid) {
             count -= wid;       /* how many chars to pad */
             memset (wptr, ch, count);
@@ -1059,7 +1059,7 @@ void mutt_FormatString (char *dest,     /* output buffer */
               *p = '_';
         }
 
-        if ((len = safe_strlen (buf)) + wlen > destlen)
+        if ((len = mutt_strlen (buf)) + wlen > destlen)
           len = (destlen - wlen > 0) ? (destlen - wlen) : 0;
 
         memcpy (wptr, buf, len);
@@ -1130,7 +1130,7 @@ FILE *mutt_open_read (const char *path, pid_t * thepid)
   FILE *f;
   struct stat s;
 
-  int len = safe_strlen (path);
+  int len = mutt_strlen (path);
 
   if (path[len - 1] == '|') {
     /* read from a pipe */
@@ -1188,7 +1188,7 @@ int mutt_save_confirm (const char *s, struct stat *st)
     }
 
     if (option (OPTCONFIRMAPPEND) &&
-        (!TrashPath || (safe_strcmp (s, TrashPath) != 0)))
+        (!TrashPath || (mutt_strcmp (s, TrashPath) != 0)))
       /* if we're appending to the trash, there's no point in asking */
     {
       snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
@@ -1231,7 +1231,7 @@ void state_prefix_putc (char c, STATE * s)
   if (s->flags & M_PENDINGPREFIX) {
     int i;
 
-    i = safe_strlen (Quotebuf);
+    i = mutt_strlen (Quotebuf);
     Quotebuf[i++] = c;
     Quotebuf[i] = '\0';
     if (i == sizeof (Quotebuf) - 1 || c == '\n') {
@@ -1285,7 +1285,7 @@ int state_printf (STATE * s, const char *fmt, ...)
 
 void state_mark_attach (STATE * s)
 {
-  if ((s->flags & M_DISPLAY) && !safe_strcmp (Pager, "builtin"))
+  if ((s->flags & M_DISPLAY) && !mutt_strcmp (Pager, "builtin"))
     state_puts (AttachmentMarker, s);
 }
 
@@ -1353,14 +1353,14 @@ BUFFER *mutt_buffer_from (BUFFER * b, char *seed)
 
   b = mutt_buffer_init (b);
   b->data = safe_strdup (seed);
-  b->dsize = safe_strlen (seed);
+  b->dsize = mutt_strlen (seed);
   b->dptr = (char *) b->data + b->dsize;
   return b;
 }
 
 void mutt_buffer_addstr (BUFFER * buf, const char *s)
 {
-  mutt_buffer_add (buf, s, safe_strlen (s));
+  mutt_buffer_add (buf, s, mutt_strlen (s));
 }
 
 void mutt_buffer_addch (BUFFER * buf, char c)