X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=64686fc9eb642343f90dc55cc7aabb6db52b46c1;hp=1ac13f5d7c7ef77e39648c8ac4daa5c3adb94e4b;hb=2891636277fb96f992eaf08b4e6acc11ca9ea57c;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/from.c b/from.c
index 1ac13f5..64686fc 100644
--- a/from.c
+++ b/from.c
@@ -22,12 +22,12 @@
 #include <ctype.h>
 #include <string.h>
 
-static const char *next_word (const char *s)
+static const char *next_word(const char *s)
 {
-  while (*s && !ISSPACE (*s))
-    s++;
-  SKIPWS (s);
-  return s;
+    while (*s && !ISSPACE(*s))
+        s++;
+    s = skipspaces(s);
+    return s;
 }
 
 int mutt_check_month (const char *s)
@@ -35,7 +35,7 @@ int mutt_check_month (const char *s)
   int i;
 
   for (i = 0; i < 12; i++)
-    if (str_ncasecmp (s, Months[i], 3) == 0)
+    if (m_strncasecmp(s, Months[i], 3) == 0)
       return (i);
   return (-1);                  /* error */
 }
@@ -47,7 +47,7 @@ static int is_day_name (const char *s)
   if ((m_strlen(s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
     return 0;
   for (i = 0; i < 7; i++)
-    if (str_ncasecmp (s, Weekdays[i], 3) == 0)
+    if (m_strncasecmp(s, Weekdays[i], 3) == 0)
       return 1;
   return 0;
 }
@@ -66,7 +66,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
   if (path)
     *path = 0;
 
-  if (str_ncmp ("From ", s, 5) != 0)
+  if (m_strncmp("From ", s, 5) != 0)
     return 0;
 
   s = next_word (s);            /* skip over the From part. */
@@ -102,8 +102,7 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
       debug_print (3, ("got return path: %s\n", path));
     }
 
-    s = p + 1;
-    SKIPWS (s);
+    s = vskipspaces(p + 1);
     if (!*s)
       return 0;