X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=from.c;h=64686fc9eb642343f90dc55cc7aabb6db52b46c1;hp=c26d5b1a6d098853014ee0f0301ffe9683052a0b;hb=022bbfdd9d1241f2e50b1cdb5a4d3dc58aaeb8bf;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/from.c b/from.c
index c26d5b1..64686fc 100644
--- a/from.c
+++ b/from.c
@@ -1,36 +1,33 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.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.
+ */
 
 #if HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 
+#include "lib/debug.h"
+
 #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)
@@ -38,19 +35,19 @@ 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 */
+  return (-1);                  /* error */
 }
 
 static int is_day_name (const char *s)
 {
   int i;
 
-  if ((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)
+  for (i = 0; i < 7; i++)
+    if (m_strncasecmp(s, Weekdays[i], 3) == 0)
       return 1;
   return 0;
 }
@@ -61,7 +58,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, size_t pathlen, time_t * tp)
 {
   struct tm tm;
   int yr;
@@ -69,82 +66,81 @@ 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 = next_word (s);            /* skip over the From part. */
   if (!*s)
     return 0;
 
-  dprint (3, (debugfile, "\nis_from(): parsing: %s", s));
+  debug_print (3, ("parsing: %s\n", s));
 
-  if (!is_day_name (s))
-  {
+  if (!is_day_name (s)) {
     const char *p;
     size_t len;
     short q = 0;
 
-    for (p = s; *p && (q || !ISSPACE (*p)); p++)
-    {
-      if (*p == '\\')
-      {
-	if (*++p == '\0') 
-	  return 0;
+    for (p = s; *p && (q || !ISSPACE (*p)); p++) {
+      if (*p == '\\') {
+        if (*++p == '\0')
+          return 0;
       }
-      else if (*p == '"')
-      {
-	q = !q;
+      else if (*p == '"') {
+        q = !q;
       }
     }
-    
-    if (q || !*p) return 0;
-    
-    if (path)
-    {
+
+    if (q || !*p)
+      return 0;
+
+    if (path) {
       len = (size_t) (p - s);
       if (len + 1 > pathlen)
-	len = pathlen - 1;
+        len = pathlen - 1;
       memcpy (path, s, len);
       path[len] = 0;
-      dprint (3, (debugfile, "is_from(): got return path: %s\n", path));
+      debug_print (3, ("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));
+    if (!is_day_name (s)) {
+      debug_print (1, ("expected weekday, got: %s\n", s));
       return 0;
     }
   }
 
   s = next_word (s);
-  if (!*s) return 0;
+  if (!*s)
+    return 0;
 
   /* do a quick check to make sure that this isn't really the day of the week.
    * this could happen when receiving mail from a local user whose login name
    * is the same as a three-letter abbreviation of the day of the week.
    */
-  if (is_day_name (s))
-  {
+  if (is_day_name (s)) {
     s = next_word (s);
-    if (!*s) return 0;
+    if (!*s)
+      return 0;
   }
 
   /* now we should be on the month. */
-  if ((tm.tm_mon = mutt_check_month (s)) < 0) return 0;
+  if ((tm.tm_mon = mutt_check_month (s)) < 0)
+    return 0;
 
   /* day */
   s = next_word (s);
-  if (!*s) return 0;
-  if (sscanf (s, "%d", &tm.tm_mday) != 1) return 0;
+  if (!*s)
+    return 0;
+  if (sscanf (s, "%d", &tm.tm_mday) != 1)
+    return 0;
 
   /* time */
   s = next_word (s);
-  if (!*s) return 0;
+  if (!*s)
+    return 0;
 
   /* Accept either HH:MM or HH:MM:SS */
   if (sscanf (s, "%d:%d:%d", &tm.tm_hour, &tm.tm_min, &tm.tm_sec) == 3);
@@ -154,34 +150,38 @@ int is_from (const char *s, char *path, size_t pathlen, time_t *tp)
     return 0;
 
   s = next_word (s);
-  if (!*s) return 0;
+  if (!*s)
+    return 0;
 
   /* timezone? */
-  if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-')
-  {
+  if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-') {
     s = next_word (s);
-    if (!*s) return 0;
+    if (!*s)
+      return 0;
 
     /*
      * some places have two timezone fields after the time, e.g.
      *      From xxxx@yyyyyyy.fr Wed Aug  2 00:39:12 MET DST 1995
      */
-    if (isalpha ((unsigned char) *s))
-    {
+    if (isalpha ((unsigned char) *s)) {
       s = next_word (s);
-      if (!*s) return 0;
+      if (!*s)
+        return 0;
     }
   }
 
   /* year */
-  if (sscanf (s, "%d", &yr) != 1) return 0;
+  if (sscanf (s, "%d", &yr) != 1)
+    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));
+
+  debug_print (3, ("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) *tp = mutt_mktime (&tm, 0);
+  if (tp)
+    *tp = mutt_mktime (&tm, 0);
   return 1;
 }