/*
+ * 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.
- */
-
-#include "mutt.h"
+ *
+ * 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.
+ */
-#include <ctype.h>
-#include <string.h>
+#include <lib-lib/lib-lib.h>
-static const char *next_word (const char *s)
-{
- while (*s && !ISSPACE (*s))
- s++;
- SKIPWS (s);
- return s;
-}
+#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 */
+ 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;
}
* 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;
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))
- {
+ 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++)
- {
- 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)
- {
- len = (size_t) (p - s);
+
+ if (q || !*p)
+ return 0;
+
+ if (path) {
+ len = 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));
}
-
- 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)) {
return 0;
}
}
- s = next_word (s);
- if (!*s) return 0;
+ s = m_strnextsp(s);
+ s = skipspaces(s);
+ 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))
- {
- s = next_word (s);
- if (!*s) return 0;
+ if (is_day_name (s)) {
+ s = m_strnextsp(s);
+ s = skipspaces(s);
+ 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;
+ 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);
- if (!*s) return 0;
+ s = m_strnextsp(s);
+ s = skipspaces(s);
+ 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);
else
return 0;
- s = next_word (s);
- if (!*s) return 0;
+ s = m_strnextsp(s);
+ s = skipspaces(s);
+ if (!*s)
+ return 0;
/* timezone? */
- if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-')
- {
- s = next_word (s);
- if (!*s) return 0;
+ if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-') {
+ s = m_strnextsp(s);
+ s = skipspaces(s);
+ 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))
- {
- s = next_word (s);
- if (!*s) return 0;
+ if (isalpha ((unsigned char) *s)) {
+ s = m_strnextsp(s);
+ s = skipspaces(s);
+ 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));
tm.tm_isdst = -1;
- if (tp) *tp = mutt_mktime (&tm, 0);
+ if (tp)
+ *tp = mutt_mktime (&tm, 0);
return 1;
}
projects / apps / madmutt.git / blobdiff