1 files changed, 87 insertions, 3 deletions

diff --git a/kmicromail/libetpan/generic/mboxdriver_cached.c b/kmicromail/libetpan/generic/mboxdriver_cached.c
index 07871fa..3af7fb9 100644
--- a/kmicromail/libetpan/generic/mboxdriver_cached.c
+++ b/kmicromail/libetpan/generic/mboxdriver_cached.c
@@ -65,48 +65,51 @@ static void mboxdriver_cached_uninitialize(mailsession * session);
 static int mboxdriver_cached_parameters(mailsession * session,
                                         int id, void * value);
 
 static int mboxdriver_cached_connect_path(mailsession * session, char * path);
 
 static int mboxdriver_cached_logout(mailsession * session);
 
 static int mboxdriver_cached_check_folder(mailsession * session);
 
 static int mboxdriver_cached_expunge_folder(mailsession * session);
 
 static int mboxdriver_cached_status_folder(mailsession * session, char * mb,
     uint32_t * result_messages, uint32_t * result_recent,
     uint32_t * result_unseen);
 static int mboxdriver_cached_messages_number(mailsession * session, char * mb,
                                              uint32_t * result);
 static int mboxdriver_cached_recent_number(mailsession * session, char * mb,
                                            uint32_t * result);
 static int mboxdriver_cached_unseen_number(mailsession * session, char * mb,
                                            uint32_t * result);
 
 static int mboxdriver_cached_append_message(mailsession * session,
                                             char * message, size_t size);
 
+static int mboxdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
+
 static int
 mboxdriver_cached_get_messages_list(mailsession * session,
                                     struct mailmessage_list ** result);
 
 static int
 mboxdriver_cached_get_envelopes_list(mailsession * session,
                               struct mailmessage_list * env_list);
 
 static int mboxdriver_cached_remove_message(mailsession * session,
                                             uint32_t num);
 
 static int mboxdriver_cached_get_message(mailsession * session,
                                          uint32_t num, mailmessage ** result);
 
 static int mboxdriver_cached_get_message_by_uid(mailsession * session,
     const char * uid,
     mailmessage ** result);
 
 static mailsession_driver local_mbox_cached_session_driver = {
   .sess_name = "mbox-cached",
 
   .sess_initialize = mboxdriver_cached_initialize,
   .sess_uninitialize = mboxdriver_cached_uninitialize,
 
@@ -116,48 +119,50 @@ static mailsession_driver local_mbox_cached_session_driver = {
   .sess_connect_stream = NULL,
   .sess_starttls = NULL,
   .sess_login = NULL,
   .sess_logout = mboxdriver_cached_logout,
   .sess_noop = NULL,
 
   .sess_build_folder_name = NULL,
   .sess_create_folder = NULL,
   .sess_delete_folder = NULL,
   .sess_rename_folder = NULL,
   .sess_check_folder = mboxdriver_cached_check_folder,
   .sess_examine_folder = NULL,
   .sess_select_folder = NULL,
   .sess_expunge_folder = mboxdriver_cached_expunge_folder,
   .sess_status_folder = mboxdriver_cached_status_folder,
   .sess_messages_number = mboxdriver_cached_messages_number,
   .sess_recent_number = mboxdriver_cached_recent_number,
   .sess_unseen_number = mboxdriver_cached_unseen_number,
   .sess_list_folders = NULL,
   .sess_lsub_folders = NULL,
   .sess_subscribe_folder = NULL,
   .sess_unsubscribe_folder = NULL,
 
   .sess_append_message = mboxdriver_cached_append_message,
+  .sess_append_message_flags = mboxdriver_cached_append_message_flags,
+  
   .sess_copy_message = NULL,
   .sess_move_message = NULL,
 
   .sess_get_messages_list = mboxdriver_cached_get_messages_list,
   .sess_get_envelopes_list = mboxdriver_cached_get_envelopes_list,
   .sess_remove_message = mboxdriver_cached_remove_message,
 #if 0
   .sess_search_messages = maildriver_generic_search_messages,
 #endif
 
   .sess_get_message = mboxdriver_cached_get_message,
   .sess_get_message_by_uid = mboxdriver_cached_get_message_by_uid,
 };
 
 mailsession_driver * mbox_cached_session_driver =
 &local_mbox_cached_session_driver;
 
 
 #define ENV_NAME "env.db"
 #define FLAGS_NAME "flags.db"
 
 
 
 static int mbox_error_to_mail_error(int error)
@@ -885,49 +890,126 @@ static int mboxdriver_cached_recent_number(mailsession * session, char * mb,
 
 static int mboxdriver_cached_unseen_number(mailsession * session, char * mb,
                                            uint32_t * result)
 {
   uint32_t messages;
   uint32_t recent;
   uint32_t unseen;
   int r;
   
   r = mboxdriver_cached_status_folder(session, mb,
       &messages, &recent, &unseen);
   if (r != MAIL_NO_ERROR)
     return r;
   
   * result = unseen;
   
   return MAIL_NO_ERROR;
 }
 
 /* messages operations */
 
 static int mboxdriver_cached_append_message(mailsession * session,
                                             char * message, size_t size)
 {
-  return mailsession_append_message(get_ancestor(session), message, size);
+  return mboxdriver_cached_append_message_flags(session,
+      message, size, NULL);
+}
+
+static int mboxdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  int r;
+  struct mailmbox_folder * folder;
+  struct mbox_cached_session_state_data * data;
+  unsigned int uid;
+  struct mailmbox_msg_info * msg_info;
+  chashdatum key;
+  chashdatum value;
+  struct mail_cache_db * cache_db_flags;
+  char filename_flags[PATH_MAX];
+  MMAPString * mmapstr;
+  char keyname[PATH_MAX];
+  
+  folder = get_mbox_session(session);
+  if (folder == NULL)
+    return MAIL_ERROR_APPEND;
+  
+  r = mailmbox_append_message_uid(folder, message, size, &uid);
+  
+  switch (r) {
+  case MAILMBOX_ERROR_FILE:
+    return MAIL_ERROR_DISKSPACE;
+  case MAILMBOX_NO_ERROR:
+    break;
+  default:
+    return mboxdriver_mbox_error_to_mail_error(r);
+  }
+  
+  /* could store in flags store instead */
+  
+  if (flags == NULL)
+    goto exit;
+  
+  key.data = &uid;
+  key.len = sizeof(uid); 
+  r = chash_get(folder->mb_hash, &key, &value);
+  if (r < 0)
+    goto exit;
+  
+  msg_info = value.data;
+  
+  data = get_cached_data(session);
+  
+  snprintf(filename_flags, PATH_MAX, "%s%c%s%c%s",
+      data->mbox_flags_directory, MAIL_DIR_SEPARATOR, data->mbox_quoted_mb,
+      MAIL_DIR_SEPARATOR, FLAGS_NAME);
+  
+  r = mail_cache_db_open_lock(filename_flags, &cache_db_flags);
+  if (r < 0)
+    goto exit;
+  
+  mmapstr = mmap_string_new("");
+  if (mmapstr == NULL)
+    goto close_db_flags;
+  
+  snprintf(keyname, PATH_MAX, "%u-%lu", uid,
+      (unsigned long) msg_info->msg_body_len);
+  
+  r = mboxdriver_write_cached_flags(cache_db_flags, mmapstr, keyname, flags);
+  
+  mmap_string_free(mmapstr);
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+  
+  if (r != MAIL_NO_ERROR)
+    goto exit;
+  
+  return MAIL_NO_ERROR;
+  
+ close_db_flags:
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+ exit:
+  return MAIL_NO_ERROR;
 }
 
 static int
 mboxdriver_cached_get_messages_list(mailsession * session,
                                     struct mailmessage_list ** result)
 {
   struct mailmbox_folder * folder;
   int res;
 
   folder = get_mbox_session(session);
   if (folder == NULL) {
     res = MAIL_ERROR_BAD_STATE;
     goto err;
   }
 
   return mbox_get_uid_messages_list(folder,
       session, mbox_cached_message_driver, result);
 
  err:
   return res;
 }
 
 static int
 get_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
@@ -939,95 +1021,97 @@ get_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
   struct mailimf_fields * fields;
   int res;
   struct mailmbox_msg_info * info;
   struct mailmbox_folder * folder;
   chashdatum key;
   chashdatum data;
   
   folder = get_mbox_session(session);
   if (folder == NULL) {
     res = MAIL_ERROR_BAD_STATE;
     goto err;
   }
   
   key.data = &num;
   key.len = sizeof(num);
   
   r = chash_get(folder->mb_hash, &key, &data);
   if (r < 0) {
     res = MAIL_ERROR_MSG_NOT_FOUND;
     goto err;
   }
   
   info = data.data;
   
-  snprintf(keyname, PATH_MAX, "%u-%u-envelope", num, info->msg_body_len);
+  snprintf(keyname, PATH_MAX, "%u-%lu-envelope", num,
+      (unsigned long) info->msg_body_len);
 
   r = generic_cache_fields_read(cache_db, mmapstr, keyname, &fields);
   if (r != MAIL_NO_ERROR) {
     res = r;
     goto err;
   }
 
   * result = fields;
 
   return MAIL_NO_ERROR;
 
  err:
   return res;
 }
 
 static int
 write_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
     mailsession * session, uint32_t num,
     struct mailimf_fields * fields)
 {
   int r;
   char keyname[PATH_MAX];
   int res;
   struct mailmbox_msg_info * info;
   struct mailmbox_folder * folder;
   chashdatum key;
   chashdatum data;
   
   folder = get_mbox_session(session);
   if (folder == NULL) {
     res = MAIL_ERROR_BAD_STATE;
     goto err;
   }
 
   key.data = &num;
   key.len = sizeof(num);
   
   r = chash_get(folder->mb_hash, &key, &data);
   if (r < 0) {
     res = MAIL_ERROR_MSG_NOT_FOUND;
     goto err;
   }
   
   info = data.data;
   
-  snprintf(keyname, PATH_MAX, "%u-%u-envelope", num, info->msg_body_len);
+  snprintf(keyname, PATH_MAX, "%u-%lu-envelope", num,
+      (unsigned long) info->msg_body_len);
 
   r = generic_cache_fields_write(cache_db, mmapstr, keyname, fields);
   if (r != MAIL_NO_ERROR) {
     res = r;
     goto err;
   }
 
   return MAIL_NO_ERROR;
 
  err:
   return res;
 }
 
 static int
 mboxdriver_cached_get_envelopes_list(mailsession * session,
                                      struct mailmessage_list * env_list)
 {
   int r;
   unsigned int i;
   struct mbox_cached_session_state_data * cached_data;
   char filename_env[PATH_MAX];
   char filename_flags[PATH_MAX];
   struct mail_cache_db * cache_db_env;
   struct mail_cache_db * cache_db_flags;