/*
+ * 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 "mutt.h"
-
#include <ctype.h>
#include <string.h>
-static const char *next_word (const char *s)
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
+#include "mutt.h"
+
+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)
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 */
}
{
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)
+ 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. */
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++) {
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;
}
}
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)