# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.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)
int i;
for (i = 0; i < 12; i++)
- if (safe_strncasecmp (s, Months[i], 3) == 0)
+ if (m_strncasecmp(s, Months[i], 3) == 0)
return (i);
return (-1); /* error */
}
{
int i;
- if ((safe_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 (safe_strncasecmp (s, Weekdays[i], 3) == 0)
+ if (m_strncasecmp(s, Weekdays[i], 3) == 0)
return 1;
return 0;
}
if (path)
*path = 0;
- if (safe_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));
+ debug_print (3, ("parsing: %s\n", s));
if (!is_day_name (s)) {
const char *p;
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));
+ debug_print (1, ("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",
+ 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));