sync with sylpheed 0.5.0pre3

diff --git a/ChangeLog b/ChangeLog
index 63f892ddc7c1c68f2f3d9b986239cd51a152bff2..2cadad87fc5daa24c5b0c9452c075c5a0f244422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2001-06-26
+
+       * src/imap.c: imap_parse_envelope(): fixed a bug that didn't
+         parse the FETCH response that continues to the next line.
+         imap_parse_fetch_element(): removed.
+
 2001-06-25
 
+       * version 0.5.0pre2
+
        * src/imap.c: imap_create_tree(): pass the path that is separated
          by the local filesystem separator to imap_create_folder().
          imap_create_folder(): examine the existence of folders using

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 18ff713cbe903848b89eec9f0471fb62bb1fd774..5861897101d8232263134d922efe26e96f31ecf7 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-06-26 [paul]
+
+        0.5.0claws3
+
+        * sync with sylpheed 0.5.0pre3
+
 2001-06-25 [paul]
 
         * src/mainwindow.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 1f97d9ad35ce1ce32606fb94ce3a83d3c3da3f0f..ab40209dfee282ff43a131823c91719943994f6f 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,5 +1,13 @@
+2001-06-26
+
+       * src/imap.c: imap_parse_envelope(): ¼¡¤Î¹Ô¤Ë³¤¯ FETCH ±þÅú¤ò
+         ²òÀϤǤ­¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ¡£
+         imap_parse_fetch_element(): ºï½ü¡£
+
 2001-06-25
 
+       * version 0.5.0pre2
+
        * src/imap.c: imap_create_tree(): imap_create_folder() ¤Ë¥í¡¼¥«¥ë
          ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥»¥Ñ¥ì¡¼¥¿¤Ç¶èÀÚ¤é¤ì¤Æ¤¤¤ë¥Ñ¥¹¤òÅϤ¹¤è¤¦¤Ë¤·¤¿¡£
          imap_create_folder(): STATUS ¥³¥Þ¥ó¥É¤ÎÂå¤ï¤ê¤Ë LIST ¤ò»È¤Ã¤Æ

diff --git a/configure.in b/configure.in
index 0126187b5ab1850c1610f3dcaa9b15ca85c14117..85c3e6e2c0f7eb85ab5f769c8da7dc61d85f1b83 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/imap.c b/src/imap.c
index 17bc19b7ca0e37b85f818c143f279bb239a562cb..db5a5a8bf872d41809dbb3b88ab17b021b39c2cc 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -44,14 +44,6 @@
 
 #define IMAP4_PORT     143
 
-typedef struct _FetchElement   FetchElement;
-
-struct _FetchElement
-{
-       gchar *name;
-       gchar *value;
-};
-
 static GList *session_list = NULL;
 
 static gint imap_cmd_count = 0;
@@ -125,8 +117,6 @@ static gchar *imap_parse_address    (SockInfo       *sock,
                                         gchar         **out_fromname_str,
                                         gchar          *orig_buf);
 static MsgFlags imap_parse_flags       (const gchar    *flag_str);
-static gchar *imap_parse_fetch_element (const gchar    *str,
-                                        FetchElement   *element);
 static MsgInfo *imap_parse_envelope    (SockInfo       *sock,
                                         gchar          *line_str);
 
@@ -1213,50 +1203,6 @@ static MsgFlags imap_parse_flags(const gchar *flag_str)
        return flags;
 }
 
-static gchar *imap_parse_fetch_element(const gchar *str, FetchElement *element)
-{
-       const gchar *name;
-       const gchar *name_end;
-       const gchar *value;
-       const gchar *value_end;
-       gint in_brace = 0;
-       gboolean in_quote = FALSE;
-
-       name = str;
-       while (*name == ' ') name++;
-       name_end = name;
-       while (*name_end != '\0' && *name_end != ' ' && *name_end != ')')
-               name_end++;
-       g_return_val_if_fail(name != name_end, NULL);
-       g_return_val_if_fail(*name_end != '\0', NULL);
-       g_return_val_if_fail(*name_end != ')', NULL);
-
-       value = name_end;
-       while (*value == ' ') value++;
-       value_end = value;
-       while (*value_end != '\0') {
-               if (*value_end == ' ' && in_brace == 0)
-                       break;
-               else if (*value_end == '(' && !in_quote)
-                       in_brace++;
-               else if (*value_end == ')' && !in_quote) {
-                       if (in_brace > 0)
-                               in_brace--;
-                       else
-                               break;
-               } else if (*value_end == '"')
-                       in_quote ^= TRUE;
-
-               value_end++;
-       }
-       g_return_val_if_fail(value != value_end, NULL);
-
-       element->name = g_strndup(name, name_end - name);
-       element->value = g_strndup(value, value_end - value);
-
-       return (gchar *)value_end;
-}
-
 static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
 {
        MsgInfo *msginfo;
@@ -1279,7 +1225,6 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
        gchar *msgid = NULL;
        MsgFlags flags = 0;
        gint n_element = 0;
-       FetchElement element = {NULL, NULL};
 
        g_return_val_if_fail(line_str != NULL, NULL);
        g_return_val_if_fail(line_str[0] == '*' && line_str[1] == ' ', NULL);
@@ -1302,40 +1247,39 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
        cur_pos++;
 
        while (n_element < 4) {
-               cur_pos = imap_parse_fetch_element(cur_pos, &element);
-               g_return_val_if_fail(cur_pos != NULL, NULL);
-
-               if (!strcmp(element.name, "UID")) {
-                       uid = strtoul(element.value, NULL, 10);
-               } else if (!strcmp(element.name, "FLAGS")) {
-                       flags = imap_parse_flags(element.value);
-               } else if (!strcmp(element.name, "RFC822.SIZE")) {
-                       size = atoi(element.value);
-               } else if (!strcmp(element.name, "ENVELOPE")) {
-                       gchar *p;
-
-                       Xstrdup_a(p, element.value,
-                                 {g_free(element.name); g_free(element.value);
-                                  return NULL;});
-                       g_free(element.name);
-                       g_free(element.value);
-                       element.name = element.value = NULL;
-
-                       g_return_val_if_fail(*p == '(', NULL);
-                       p = imap_parse_atom(sock, p + 1, buf, NULL);
+               while (*cur_pos == ' ') cur_pos++;
+
+               if (!strncmp(cur_pos, "UID ", 4)) {
+                       cur_pos += 4;
+                       uid = strtoul(cur_pos, &cur_pos, 10);
+               } else if (!strncmp(cur_pos, "FLAGS ", 6)) {
+                       cur_pos += 6;
+                       g_return_val_if_fail(*cur_pos == '(', NULL);
+                       cur_pos++;
+                       PARSE_ONE_ELEMENT(')');
+                       flags = imap_parse_flags(buf);
+               } else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
+                       cur_pos += 12;
+                       size = strtol(cur_pos, &cur_pos, 10);
+               } else if (!strncmp(cur_pos, "ENVELOPE ", 9)) {
+                       cur_pos += 9;
+                       g_return_val_if_fail(*cur_pos == '(', NULL);
+                       cur_pos = imap_parse_atom
+                               (sock, cur_pos + 1, buf, line_str);
                        Xstrdup_a(date, buf, return NULL);
                        date_t = procheader_date_parse(NULL, date, 0);
 
-                       p = imap_parse_atom(sock, p, buf, NULL);
+                       cur_pos = imap_parse_atom
+                               (sock, cur_pos, buf, line_str);
                        if (buf[0] != '\0') {
                                conv_unmime_header(tmp, sizeof(tmp), buf, NULL);
                                Xstrdup_a(subject, tmp, return NULL);
                        }
 
-                       g_return_val_if_fail(*p == ' ', NULL);
-                       p = imap_parse_address(sock, p + 1,
-                                              &tmp_from, &tmp_fromname,
-                                              line_str);
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_address(sock, cur_pos + 1,
+                                                    &tmp_from, &tmp_fromname,
+                                                    line_str);
                        Xstrdup_a(from, tmp_from,
                                  {g_free(tmp_from); g_free(tmp_fromname);
                                   return NULL;});
@@ -1347,17 +1291,18 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
 
 #define SKIP_ONE_ELEMENT() \
 { \
-       g_return_val_if_fail(*p == ' ', NULL); \
-       p = imap_parse_address(sock, p + 1, NULL, NULL, NULL); \
+       g_return_val_if_fail(*cur_pos == ' ', NULL); \
+       cur_pos = imap_parse_address(sock, cur_pos + 1, NULL, NULL, \
+                                    line_str); \
 }
 
                        /* skip sender and reply-to */
                        SKIP_ONE_ELEMENT();
                        SKIP_ONE_ELEMENT();
 
-                       g_return_val_if_fail(*p == ' ', NULL);
-                       p = imap_parse_address(sock, p + 1, &tmp_to, NULL,
-                                              NULL);
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_address(sock, cur_pos + 1,
+                                                    &tmp_to, NULL, line_str);
                        Xstrdup_a(to, tmp_to, {g_free(tmp_to); return NULL;});
                        g_free(tmp_to);
 
@@ -1367,8 +1312,8 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
 
 #undef SKIP_ONE_ELEMENT
 
-                       g_return_val_if_fail(*p == ' ', NULL);
-                       p = imap_parse_atom(sock, p, buf, NULL);
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_atom(sock, cur_pos, buf, line_str);
                        if (buf[0] != '\0') {
                                eliminate_parenthesis(buf, '(', ')');
                                extract_parenthesis(buf, '<', '>');
@@ -1376,24 +1321,21 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
                                Xstrdup_a(inreplyto, buf, return NULL);
                        }
 
-                       g_return_val_if_fail(*p == ' ', NULL);
-                       p = imap_parse_atom(sock, p, buf, NULL);
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_atom(sock, cur_pos, buf, line_str);
                        if (buf[0] != '\0') {
                                extract_parenthesis(buf, '<', '>');
                                remove_space(buf);
                                Xstrdup_a(msgid, buf, return NULL);
                        }
 
-                       g_return_val_if_fail(*p == ')', NULL);
+                       g_return_val_if_fail(*cur_pos == ')', NULL);
+                       cur_pos++;
                } else {
-                       g_warning("invalid element: %s\n", buf);
-                       g_free(element.name);
-                       g_free(element.value);
+                       g_warning("invalid FETCH response: %s\n", cur_pos);
                        break;
                }
 
-               g_free(element.name);
-               g_free(element.value);
                if (*cur_pos == '\0' || *cur_pos == ')') break;
                n_element++;
        }
@@ -1918,7 +1860,7 @@ static gchar *strchr_cpy(const gchar *src, gchar ch, gchar *dest, gint len)
 
        dest[0] = '\0';
        tmp = strchr(src, ch);
-       if (!tmp || tmp == src)
+       if (!tmp)
                return NULL;
 
        memcpy(dest, src, MIN(tmp - src, len - 1));