projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use m_tempfile()
[apps/madmutt.git]
/
from.c
diff --git
a/from.c
b/from.c
index
e3c85eb
..
5931789
100644
(file)
--- a/
from.c
+++ b/
from.c
@@
-7,36
+7,16
@@
* please see the file GPL in the top level source directory.
*/
* 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/lib-lib.h>
#include "mutt.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)
-{
- while (*s && !ISSPACE (*s))
- s++;
- SKIPWS (s);
- return s;
-}
-
int mutt_check_month (const char *s)
{
int i;
for (i = 0; i < 12; i++)
int mutt_check_month (const char *s)
{
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 */
}
@@
-45,10
+25,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;
}
@@
-59,7
+39,7
@@
static int is_day_name (const char *s)
* From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
*/
* 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, s
s
ize_t pathlen, time_t * tp)
{
struct tm tm;
int yr;
{
struct tm tm;
int yr;
@@
-67,18
+47,17
@@
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;
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;
if (!*s)
return 0;
- debug_print (3, ("parsing: %s\n", s));
-
if (!is_day_name (s)) {
const char *p;
if (!is_day_name (s)) {
const char *p;
- size_t len;
+ s
s
ize_t len;
short q = 0;
for (p = s; *p && (q || !ISSPACE (*p)); p++) {
short q = 0;
for (p = s; *p && (q || !ISSPACE (*p)); p++) {
@@
-95,26
+74,24
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
return 0;
if (path) {
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;
if (len + 1 > pathlen)
len = pathlen - 1;
memcpy (path, s, len);
path[len] = 0;
- 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)) {
if (!*s)
return 0;
if (!is_day_name (s)) {
- debug_print (1, ("expected weekday, got: %s\n", s));
return 0;
}
}
return 0;
}
}
- s = next_word (s);
+ s = m_strnextsp(s);
+ s = skipspaces(s);
if (!*s)
return 0;
if (!*s)
return 0;
@@
-123,7
+100,8
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
* is the same as a three-letter abbreviation of the day of the week.
*/
if (is_day_name (s)) {
* is the same as a three-letter abbreviation of the day of the week.
*/
if (is_day_name (s)) {
- s = next_word (s);
+ s = m_strnextsp(s);
+ s = skipspaces(s);
if (!*s)
return 0;
}
if (!*s)
return 0;
}
@@
-133,14
+111,16
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
return 0;
/* day */
return 0;
/* day */
- s = next_word (s);
+ s = m_strnextsp(s);
+ s = skipspaces(s);
if (!*s)
return 0;
if (sscanf (s, "%d", &tm.tm_mday) != 1)
return 0;
/* time */
if (!*s)
return 0;
if (sscanf (s, "%d", &tm.tm_mday) != 1)
return 0;
/* time */
- s = next_word (s);
+ s = m_strnextsp(s);
+ s = skipspaces(s);
if (!*s)
return 0;
if (!*s)
return 0;
@@
-151,13
+131,15
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
else
return 0;
else
return 0;
- s = next_word (s);
+ s = m_strnextsp(s);
+ s = skipspaces(s);
if (!*s)
return 0;
/* timezone? */
if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-') {
if (!*s)
return 0;
/* timezone? */
if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-') {
- s = next_word (s);
+ s = m_strnextsp(s);
+ s = skipspaces(s);
if (!*s)
return 0;
if (!*s)
return 0;
@@
-166,7
+148,8
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
* From xxxx@yyyyyyy.fr Wed Aug 2 00:39:12 MET DST 1995
*/
if (isalpha ((unsigned char) *s)) {
* From xxxx@yyyyyyy.fr Wed Aug 2 00:39:12 MET DST 1995
*/
if (isalpha ((unsigned char) *s)) {
- s = next_word (s);
+ s = m_strnextsp(s);
+ s = skipspaces(s);
if (!*s)
return 0;
}
if (!*s)
return 0;
}
@@
-177,10
+160,6
@@
int is_from (const char *s, char *path, size_t pathlen, time_t * tp)
return 0;
tm.tm_year = yr > 1900 ? yr - 1900 : (yr < 70 ? yr + 100 : yr);
return 0;
tm.tm_year = yr > 1900 ? yr - 1900 : (yr < 70 ? yr + 100 : yr);
- 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)
tm.tm_isdst = -1;
if (tp)