projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix regression introduced in 73359dc55ff8f4da32149f7270f7ceaccd658256.
[apps/madmutt.git]
/
imap
/
util.c
diff --git
a/imap/util.c
b/imap/util.c
index
abcbe2b
..
d48101b
100644
(file)
--- a/
imap/util.c
+++ b/
imap/util.c
@@
-14,11
+14,10
@@
#include <lib-lib/lib-lib.h>
#include <signal.h>
#include <netdb.h>
#include <lib-lib/lib-lib.h>
#include <signal.h>
#include <netdb.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "mutt.h"
-#include "mx.h" /* for M_IMAP */
#include "imap_private.h"
#include "imap_private.h"
-#include <lib-sys/mutt_ssl.h>
/* -- public functions -- */
/* -- public functions -- */
@@
-258,45
+257,31
@@
time_t imap_parse_date (char *s)
struct tm t;
time_t tz;
struct tm t;
time_t tz;
- t.tm_mday = (s[0] == ' ' ? s[1] - '0' : (s[0] - '0') * 10 + (s[1] - '0'));
- s += 2;
- if (*s != '-')
+ t.tm_mday = strtol(s, &s, 10);
+ if (*s++ != '-')
return 0;
return 0;
- s++;
- t.tm_mon = mutt_check_month (s);
+ t.tm_mon = mutt_check_month(s);
s += 3;
s += 3;
- if (*s != '-')
+ if (*s
++
!= '-')
return 0;
return 0;
- s++;
- t.tm_year =
- (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] -
- '0') -
- 1900;
- s += 4;
- if (*s != ' ')
+ t.tm_year = strtol(s, &s, 10) - 1900;
+ if (*s++ != ' ')
return 0;
return 0;
- s++;
/* time */
/* time */
- t.tm_hour = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
+ t.tm_hour = strtol(s, &s, 10);
+ if (*s++ != ':')
return 0;
return 0;
- s++;
- t.tm_min = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
+ t.tm_min = strtol(s, &s, 10);
+ if (*s++ != ':')
return 0;
return 0;
- s++;
- t.tm_sec = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ' ')
+ t.tm_sec = strtol(s, &s, 10);
+ if (*s++ != ' ')
return 0;
return 0;
- s++;
/* timezone */
/* timezone */
- tz =
((s[1] - '0') * 10 + (s[2] - '0')) * 3600 +
-
((s[3] - '0') * 10 + (s[4] - '0')
) * 60;
+ tz =
strtol(s + 1, NULL, 10);
+
tz = (tz / 100) * 3600 + (tz % 100
) * 60;
if (s[0] == '+')
tz = -tz;
if (s[0] == '+')
tz = -tz;
@@
-408,12
+393,12
@@
void imap_unmunge_mbox_name (char *s)
/* imap_wordcasecmp: find word a in word list b */
int imap_wordcasecmp (const char *a, const char *b)
{
/* imap_wordcasecmp: find word a in word list b */
int imap_wordcasecmp (const char *a, const char *b)
{
- char tmp[S
HORT_S
TRING];
+ char tmp[STRING];
char *s = (char *) b;
int i;
char *s = (char *) b;
int i;
- tmp[S
HORT_S
TRING - 1] = 0;
- for (i = 0; i < S
HORT_S
TRING - 2; i++, s++) {
+ tmp[STRING - 1] = 0;
+ for (i = 0; i < STRING - 2; i++, s++) {
if (!*s || ISSPACE (*s)) {
tmp[i] = 0;
break;
if (!*s || ISSPACE (*s)) {
tmp[i] = 0;
break;