X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=07b90138aeeffa28a465e16808dd734384a97e12;hp=33d6e849f3d3c8343a03a26524f57a7c8f02d5a3;hb=c8c9a616c8c369da6aa06e656eacfb82af8707a8;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/from.c b/from.c
index 33d6e84..07b9013 100644
--- a/from.c
+++ b/from.c
@@ -11,29 +11,21 @@
 # include "config.h"
 #endif
 
-#include "mutt.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-
 #include <ctype.h>
 #include <string.h>
 
-static const char *next_word (const char *s)
-{
-  while (*s && !ISSPACE (*s))
-    s++;
-  SKIPWS (s);
-  return s;
-}
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
+#include "mutt.h"
 
 int mutt_check_month (const char *s)
 {
   int i;
 
   for (i = 0; i < 12; i++)
-    if (mutt_strncasecmp (s, Months[i], 3) == 0)
+    if (m_strncasecmp(s, Months[i], 3) == 0)
       return (i);
   return (-1);                  /* error */
 }
@@ -42,10 +34,10 @@ static int is_day_name (const char *s)
 {
   int i;
 
-  if ((mutt_strlen (s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
+  if ((m_strlen(s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
     return 0;
   for (i = 0; i < 7; i++)
-    if (mutt_strncasecmp (s, Weekdays[i], 3) == 0)
+    if (m_strncasecmp(s, Weekdays[i], 3) == 0)
       return 1;
   return 0;
 }
@@ -56,7 +48,7 @@ static int is_day_name (const char *s)
  * From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
  */
 
-int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
+int is_from (const char *s, char *path, ssize_t pathlen, time_t * tp)
 {
   struct tm tm;
   int yr;
@@ -64,18 +56,17 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
   if (path)
     *path = 0;
 
-  if (mutt_strncmp ("From ", s, 5) != 0)
+  if (m_strncmp("From ", s, 5) != 0)
     return 0;
 
-  s = next_word (s);            /* skip over the From part. */
+  s = m_strnextsp(s);            /* skip over the From part. */
+  s = skipspaces(s);
   if (!*s)
     return 0;
 
-  dprint (3, (debugfile, "\nis_from(): parsing: %s", s));
-
   if (!is_day_name (s)) {
     const char *p;
-    size_t len;
+    ssize_t len;
     short q = 0;
 
     for (p = s; *p && (q || !ISSPACE (*p)); p++) {
@@ -92,26 +83,24 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
       return 0;
 
     if (path) {
-      len = (size_t) (p - s);
+      len = p - s;
       if (len + 1 > pathlen)
         len = pathlen - 1;
       memcpy (path, s, len);
       path[len] = 0;
-      dprint (3, (debugfile, "is_from(): got return path: %s\n", path));
     }
 
-    s = p + 1;
-    SKIPWS (s);
+    s = vskipspaces(p + 1);
     if (!*s)
       return 0;
 
     if (!is_day_name (s)) {
-      dprint (1, (debugfile, "is_from():  expected weekday, got: %s\n", s));
       return 0;
     }
   }
 
-  s = next_word (s);
+  s = m_strnextsp(s);
+  s = skipspaces(s);
   if (!*s)
     return 0;
 
@@ -120,7 +109,8 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
    * is the same as a three-letter abbreviation of the day of the week.
    */
   if (is_day_name (s)) {
-    s = next_word (s);
+    s = m_strnextsp(s);
+    s = skipspaces(s);
     if (!*s)
       return 0;
   }
@@ -130,14 +120,16 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
     return 0;
 
   /* day */
-  s = next_word (s);
+  s = m_strnextsp(s);
+  s = skipspaces(s);
   if (!*s)
     return 0;
   if (sscanf (s, "%d", &tm.tm_mday) != 1)
     return 0;
 
   /* time */
-  s = next_word (s);
+  s = m_strnextsp(s);
+  s = skipspaces(s);
   if (!*s)
     return 0;
 
@@ -148,13 +140,15 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
   else
     return 0;
 
-  s = next_word (s);
+  s = m_strnextsp(s);
+  s = skipspaces(s);
   if (!*s)
     return 0;
 
   /* timezone? */
   if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-') {
-    s = next_word (s);
+    s = m_strnextsp(s);
+    s = skipspaces(s);
     if (!*s)
       return 0;
 
@@ -163,7 +157,8 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
      *      From xxxx@yyyyyyy.fr Wed Aug  2 00:39:12 MET DST 1995
      */
     if (isalpha ((unsigned char) *s)) {
-      s = next_word (s);
+      s = m_strnextsp(s);
+      s = skipspaces(s);
       if (!*s)
         return 0;
     }
@@ -174,12 +169,6 @@ int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
     return 0;
   tm.tm_year = yr > 1900 ? yr - 1900 : (yr < 70 ? yr + 100 : yr);
 
-  dprint (3,
-          (debugfile,
-           "is_from(): month=%d, day=%d, hr=%d, min=%d, sec=%d, yr=%d.\n",
-           tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
-           tm.tm_year));
-
   tm.tm_isdst = -1;
 
   if (tp)