projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move debug.c
[apps/madmutt.git]
/
from.c
diff --git
a/from.c
b/from.c
index
cc61283
..
eafdfe6
100644
(file)
--- a/
from.c
+++ b/
from.c
@@
-11,23
+11,22
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <ctype.h>
+#include <string.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
#include "mutt.h"
#include "mutt.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 mutt_check_month (const char *s)
@@
-35,7
+34,7
@@
int mutt_check_month (const char *s)
int i;
for (i = 0; i < 12; i++)
int i;
for (i = 0; i < 12; i++)
- if (
str_ncasecmp
(s, Months[i], 3) == 0)
+ if (
m_strncasecmp
(s, Months[i], 3) == 0)
return (i);
return (-1); /* error */
}
return (i);
return (-1); /* error */
}
@@
-44,10
+43,10
@@
static int is_day_name (const char *s)
{
int i;
{
int i;
- if ((
str_len
(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++)
return 0;
for (i = 0; i < 7; i++)
- if (
str_ncasecmp
(s, Weekdays[i], 3) == 0)
+ if (
m_strncasecmp
(s, Weekdays[i], 3) == 0)
return 1;
return 0;
}
return 1;
return 0;
}
@@
-66,7
+65,7
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
if (path)
*path = 0;
if (path)
*path = 0;
- if (
str_ncmp
("From ", s, 5) != 0)
+ if (
m_strncmp
("From ", s, 5) != 0)
return 0;
s = next_word (s); /* skip over the From part. */
return 0;
s = next_word (s); /* skip over the From part. */
@@
-102,8
+101,7
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
debug_print (3, ("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 (!*s)
return 0;