Changeset 3772

Timestamp:

09/26/08 11:07:12

Author:

jdapena

Message:

Backported from trunk:
* Adding extra checks on writing to summary on disk, to make sure we

detect if summary save_rewrite process was complete, and then, we can
load again the summary or consider this corrupt.

Files:

• releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (7 diffs)
• releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/camel-store-summary.c (modified) (1 diff)
• releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-summary.c (modified) (2 diffs)
• releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/providers/local/camel-mbox-summary.c (modified) (1 diff)

releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/camel-folder-summary.c

@@ -1951 +1951 @@
-                                        else return -1;
-                                }
-
+
+
-                }
-        }
@@ -2086 +2087 @@
-
-        /* we always write out the current version */
-camel_file_util_encode_fixed_int32(out, CAMEL_FOLDER_SUMMARY_VERSION)
-camel_file_util_encode_fixed_int32(out, s->flags)
-camel_file_util_encode_fixed_int32(out, s->nextuid)
-camel_file_util_encode_time_t(out, s->time)
+if (camel_file_util_encode_fixed_int32(out, CAMEL_FOLDER_SUMMARY_VERSION) == -1) return -1
+if (camel_file_util_encode_fixed_int32(out, s->flags) == -1) return -1
+if (camel_file_util_encode_fixed_int32(out, s->nextuid) == -1) return -1
+if (camel_file_util_encode_time_t(out, s->time) == -1) return -1
-
-        count = camel_folder_summary_count(s);
@@ -2108 +2109 @@
-        }
-
-camel_file_util_encode_fixed_int32(out, count)
-camel_file_util_encode_fixed_int32(out, unread)
-camel_file_util_encode_fixed_int32(out, deleted)
+if (camel_file_util_encode_fixed_int32(out, count) == -1) return -1
+if (camel_file_util_encode_fixed_int32(out, unread) == -1) return -1
+if (camel_file_util_encode_fixed_int32(out, deleted) == -1) return -1
-
-        return camel_file_util_encode_fixed_int32(out, junk);
@@ -2551 +2552 @@
-        io(printf("Saving message info\n"));
-
-camel_file_util_encode_string(out, camel_message_info_uid(mi))
-
-camel_file_util_encode_uint32(out, mi->size)
-camel_file_util_encode_uint32(out, mi->flags)
-
-camel_file_util_encode_time_t(out, mi->date_sent)
-camel_file_util_encode_time_t(out, mi->date_received)
-camel_file_util_encode_string(out, camel_message_info_subject(mi))
-camel_file_util_encode_string(out, camel_message_info_from(mi))
-camel_file_util_encode_string(out, camel_message_info_to(mi))
-camel_file_util_encode_string(out, camel_message_info_cc(mi))
+if (camel_file_util_encode_string(out, camel_message_info_uid(mi))== -1) return -1
+
+if (camel_file_util_encode_uint32(out, mi->size)== -1) return -1
+if (camel_file_util_encode_uint32(out, mi->flags)== -1) return -1
+
+if (camel_file_util_encode_time_t(out, mi->date_sent)== -1) return -1
+if (camel_file_util_encode_time_t(out, mi->date_received)== -1) return -1
+if (camel_file_util_encode_string(out, camel_message_info_subject(mi))== -1) return -1
+if (camel_file_util_encode_string(out, camel_message_info_from(mi))== -1) return -1
+if (camel_file_util_encode_string(out, camel_message_info_to(mi))== -1) return -1
+if (camel_file_util_encode_string(out, camel_message_info_cc(mi))== -1) return -1
-
-#ifdef NON_TINYMAIL_FEATURES
-camel_file_util_encode_string(out, camel_message_info_mlist(mi))
+if (camel_file_util_encode_string(out, camel_message_info_mlist(mi))== -1) return -1
-#else
-camel_file_util_encode_string(out, "")
+if (camel_file_util_encode_string(out, "")== -1) return -1
-#endif
-
-camel_file_util_encode_fixed_int32(out, mi->message_id.id.part.hi)
-camel_file_util_encode_fixed_int32(out, mi->message_id.id.part.lo)
+if (camel_file_util_encode_fixed_int32(out, mi->message_id.id.part.hi)== -1) return -1
+if (camel_file_util_encode_fixed_int32(out, mi->message_id.id.part.lo)== -1) return -1
-
-#ifdef NON_TINYMAIL_FEATURES
-        if (mi->references) {
-camel_file_util_encode_uint32(out, mi->references->size)
+if (camel_file_util_encode_uint32(out, mi->references->size)== -1) return -1
-                for (i=0;i<mi->references->size;i++) {
-camel_file_util_encode_fixed_int32(out, mi->references->references[i].id.part.hi)
-camel_file_util_encode_fixed_int32(out, mi->references->references[i].id.part.lo)
+if (camel_file_util_encode_fixed_int32(out, mi->references->references[i].id.part.hi)== -1) return -1
+if (camel_file_util_encode_fixed_int32(out, mi->references->references[i].id.part.lo)== -1) return -1
-                }
-        } else {
-#endif
-camel_file_util_encode_uint32(out, 0)
+if (camel_file_util_encode_uint32(out, 0)== -1) return -1
-
-#ifdef NON_TINYMAIL_FEATURES
@@ -2590 +2591 @@
-#endif
-
-camel_file_util_encode_uint32(out, count)
+if (camel_file_util_encode_uint32(out, count)== -1) return -1
-
-#ifdef NON_TINYMAIL_FEATURES
-        flag = mi->user_flags;
-        while (flag) {
-camel_file_util_encode_string(out, flag->name)
+if (camel_file_util_encode_string(out, flag->name)== -1) return -1
-                flag = flag->next;
-        }
@@ -2606 +2607 @@
-#endif
-
-camel_file_util_encode_uint32(out, count)
+if (camel_file_util_encode_uint32(out, count)== -1) return -1
-
-#ifdef NON_TINYMAIL_FEATURES
-        tag = mi->user_tags;
-        while (tag) {
-camel_file_util_encode_string(out, tag->name)
-camel_file_util_encode_string(out, tag->value)
+if (camel_file_util_encode_string(out, tag->name)== -1) return -1
+if (camel_file_util_encode_string(out, tag->value)== -1) return -1
-                tag = tag->next;
-        }
@@ -2769 +2770 @@
-
-        if (ct) {
-camel_folder_summary_encode_token(out, ct->type)
-camel_folder_summary_encode_token(out, ct->subtype)
-camel_file_util_encode_uint32(out, my_list_size((struct _node **)&ct->params))
+if (camel_folder_summary_encode_token(out, ct->type) == -1) return -1
+if (camel_folder_summary_encode_token(out, ct->subtype)) return -1
+if (camel_file_util_encode_uint32(out, my_list_size((struct _node **)&ct->params))) return -1
-                hp = ct->params;
-                while (hp) {
-camel_folder_summary_encode_token(out, hp->name)
-camel_folder_summary_encode_token(out, hp->value)
+if (camel_folder_summary_encode_token(out, hp->name)) return -1
+if (camel_folder_summary_encode_token(out, hp->value)) return -1
-                        hp = hp->next;
-                }
-        } else {
-camel_folder_summary_encode_token(out, NULL)
-camel_folder_summary_encode_token(out, NULL)
-camel_file_util_encode_uint32(out, 0)
+if (camel_folder_summary_encode_token(out, NULL)) return -1
+if (camel_folder_summary_encode_token(out, NULL)) return -1
+if (camel_file_util_encode_uint32(out, 0)) return -1
-        }
-
-        if (ci) {
-camel_folder_summary_encode_token(out, ci->id)
-camel_folder_summary_encode_token(out, ci->description)
-camel_folder_summary_encode_token(out, ci->encoding)
+if (camel_folder_summary_encode_token(out, ci->id)) return -1
+if (camel_folder_summary_encode_token(out, ci->description)) return -1
+if (camel_folder_summary_encode_token(out, ci->encoding)) return -1
-                retval = camel_file_util_encode_uint32(out, ci->size);
-        } else {
-camel_folder_summary_encode_token(out, "invalid")
-camel_folder_summary_encode_token(out, "invalid")
-camel_folder_summary_encode_token(out, "text/plain")
+if (camel_folder_summary_encode_token(out, "invalid")) return -1
+if (camel_folder_summary_encode_token(out, "invalid")) return -1
+if (camel_folder_summary_encode_token(out, "text/plain")) return -1
-                retval = camel_file_util_encode_uint32(out, 0);
-        }

releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/camel-store-summary.c

@@ -853 +853 @@
-
-        /* always write latest version */
-camel_file_util_encode_fixed_int32(out, CAMEL_STORE_SUMMARY_VERSION)
-camel_file_util_encode_fixed_int32(out, s->flags)
-camel_file_util_encode_time_t(out, s->time)
+if (camel_file_util_encode_fixed_int32(out, CAMEL_STORE_SUMMARY_VERSION)==-1) return -1
+if (camel_file_util_encode_fixed_int32(out, s->flags)==-1) return -1
+if (camel_file_util_encode_time_t(out, s->time)==-1) return -1
-        return camel_file_util_encode_fixed_int32(out, camel_store_summary_count(s));
-}

releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-summary.c

@@ -203 +203 @@
-                return -1;
-
-camel_file_util_encode_fixed_int32(out, CAMEL_IMAP_SUMMARY_VERSION)
+if (camel_file_util_encode_fixed_int32(out, CAMEL_IMAP_SUMMARY_VERSION) == -1) return -1
-
-        return camel_file_util_encode_fixed_int32(out, ims->validity);
@@ -283 +283 @@
-{
-        if (info && info->type) {
-camel_file_util_encode_uint32 (out, 1)
+if (camel_file_util_encode_uint32 (out, 1)== -1) return -1
-                return camel_imap_summary_parent->content_info_save (s, out, info);
-        } else

releases/modest/diablo-pe2/libtinymail-camel/camel-lite/camel/providers/local/camel-mbox-summary.c

@@ -275 +275 @@
-                return -1;
-
-camel_file_util_encode_fixed_int32(out, CAMEL_MBOX_SUMMARY_VERSION)
+if (camel_file_util_encode_fixed_int32(out, CAMEL_MBOX_SUMMARY_VERSION) == -1) return -1
-
-        return camel_file_util_encode_size_t(out, mbs->folder_size);