sync with sylpheed 0.6.5cvs12

diff --git a/ChangeLog b/ChangeLog
index 966b330..0e9a004 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-20
+
+       * src/procheader.c: procheader_date_parse(): workaround for
+         RFC-incompliant Date header.
+
 2001-11-20
 
        * src/addrbook.c: removed redundant functions, and fixed generation

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 247bf1c..db5053e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-11-21 [paul]      0.6.5claws26
+
+       * sync with sylpheed 0.6.5cvs12
+               see 2nd ChangeLog entry dated 2001-11-20
+
 2001-11-20 [paul]      0.6.5claws25
 
        * sync with sylpheed 0.6.5cvs11

diff --git a/ChangeLog.jp b/ChangeLog.jp
index c8c5abf..52572c0 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2001-11-20
+
+       * src/procheader.c: procheader_date_parse(): RFC Èó½àµò¤Î Date
+         ¥Ø¥Ã¥À¤Ø¤ÎÂн衣
+
 2001-11-20
 
        * src/addrbook.c: ;ʬ¤Ê´Ø¿ô¤òºï½ü¤·¡¢ÉÔÀµ¤Ê¥¢¥É¥ì¥¹Ä¢¥Õ¥¡¥¤¥ë̾

diff --git a/configure.in b/configure.in
index e2a3498..1571bc5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/procheader.c b/src/procheader.c
index 249eeb4..af91904 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -688,9 +688,9 @@ gchar *procheader_get_fromname(const gchar *str)
 time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
 {
        static gchar monthstr[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
-       gchar weekday[4];
+       gchar weekday[11];
        gint day;
-       gchar month[4];
+       gchar month[10];
        gint year;
        gint hh, mm, ss;
        gchar zone[6];
@@ -701,17 +701,17 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
        time_t timer;
 
        /* parsing date field... */
-       result = sscanf(src, "%3s, %d %3s %d %2d:%2d:%2d %5s",
+       result = sscanf(src, "%10s %d %9s %d %2d:%2d:%2d %5s",
                        weekday, &day, month, &year, &hh, &mm, &ss, zone);
        if (result != 8) {
-               result = sscanf(src, "%d %3s %d %2d:%2d:%2d %5s",
+               result = sscanf(src, "%d %9s %d %2d:%2d:%2d %5s",
                                &day, month, &year, &hh, &mm, &ss, zone);
                if (result != 7) {
                        ss = 0;
-                       result = sscanf(src, "%3s, %d %3s %d %2d:%2d %5s",
+                       result = sscanf(src, "%10s %d %9s %d %2d:%2d %5s",
                                        weekday, &day, month, &year, &hh, &mm, zone);
                        if (result != 7) {
-                               result = sscanf(src, "%d %3s %d %2d:%2d %5s",
+                               result = sscanf(src, "%d %9s %d %2d:%2d %5s",
                                                &day, month, &year, &hh, &mm,
                                                zone);
                                if (result != 6) {
@@ -732,6 +732,7 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
                        year += 1900;
        }
 
+       month[3] = '\0';
        if ((p = strstr(monthstr, month)) != NULL)
                dmonth = (gint)(p - monthstr) / 3 + 1;
        else {