1 files changed, 10 insertions, 0 deletions

diff --git a/kmicromail/libetpan/generic/mboxdriver.c b/kmicromail/libetpan/generic/mboxdriver.c
index fa3e2ea..c19a668 100644
--- a/kmicromail/libetpan/generic/mboxdriver.c
+++ b/kmicromail/libetpan/generic/mboxdriver.c
@@ -32,145 +32,149 @@
 /*
  * $Id$
  */
 
 #include "mboxdriver.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <sys/times.h>
 
 #include "mail.h"
 #include "maildriver_tools.h"
 #include "mailmbox.h"
 #include "mboxdriver_tools.h"
 #include "maildriver.h"
 #include "carray.h"
 #include "mboxdriver_message.h"
 #include "mailmessage.h"
 
 static int mboxdriver_initialize(mailsession * session);
 
 static void mboxdriver_uninitialize(mailsession * session);
 
 static int mboxdriver_parameters(mailsession * session,
                                  int id, void * value);
 
 static int mboxdriver_connect_path(mailsession * session, char * path);
 
 static int mboxdriver_logout(mailsession * session);
 
 static int mboxdriver_expunge_folder(mailsession * session);
 
 static int mboxdriver_status_folder(mailsession * session, char * mb,
     uint32_t * result_messages, uint32_t * result_recent,
     uint32_t * result_unseen);
 
 static int mboxdriver_messages_number(mailsession * session, char * mb,
                                       uint32_t * result);
 
 static int mboxdriver_append_message(mailsession * session,
                                      char * message, size_t size);
 
+static int mboxdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
+
 static int mboxdriver_get_messages_list(mailsession * session,
                                         struct mailmessage_list ** result);
 
 static int
 mboxdriver_get_envelopes_list(mailsession * session,
                               struct mailmessage_list * env_list);
 
 static int mboxdriver_remove_message(mailsession * session, uint32_t num);
 
 static int mboxdriver_get_message(mailsession * session,
                                   uint32_t num, mailmessage ** result);
 
 static int mboxdriver_get_message_by_uid(mailsession * session,
     const char * uid,
     mailmessage ** result);
 
 static mailsession_driver local_mbox_session_driver = {
   .sess_name = "mbox",
 
   .sess_initialize = mboxdriver_initialize,
   .sess_uninitialize = mboxdriver_uninitialize,
 
   .sess_parameters = mboxdriver_parameters,
 
   .sess_connect_path = mboxdriver_connect_path,
   .sess_connect_stream = NULL,
   .sess_starttls = NULL,
   .sess_login = NULL,
   .sess_logout = mboxdriver_logout,
   .sess_noop = NULL,
 
   .sess_build_folder_name = NULL,
   .sess_create_folder = NULL,
   .sess_delete_folder = NULL,
   .sess_rename_folder = NULL,
   .sess_check_folder = NULL,
   .sess_examine_folder = NULL,
   .sess_select_folder = NULL,
   .sess_expunge_folder = mboxdriver_expunge_folder,
   .sess_status_folder = mboxdriver_status_folder,
   .sess_messages_number = mboxdriver_messages_number,
   .sess_recent_number = mboxdriver_messages_number,
   .sess_unseen_number = mboxdriver_messages_number,
   .sess_list_folders = NULL,
   .sess_lsub_folders = NULL,
   .sess_subscribe_folder = NULL,
   .sess_unsubscribe_folder = NULL,
 
   .sess_append_message = mboxdriver_append_message,
+  .sess_append_message_flags = mboxdriver_append_message_flags,
   .sess_copy_message = NULL,
   .sess_move_message = NULL,
 
   .sess_get_messages_list = mboxdriver_get_messages_list,
   .sess_get_envelopes_list = mboxdriver_get_envelopes_list,
   .sess_remove_message = mboxdriver_remove_message,
 #if 0
   .sess_search_messages = maildriver_generic_search_messages,
 #endif
 
   .sess_get_message = mboxdriver_get_message,
   .sess_get_message_by_uid = mboxdriver_get_message_by_uid,
 };
 
 mailsession_driver * mbox_session_driver = &local_mbox_session_driver;
 
 static inline struct mbox_session_state_data * get_data(mailsession * session)
 {
   return session->sess_data;
 }
 
 static inline struct mailmbox_folder * get_mbox_session(mailsession * session)
 {
   return get_data(session)->mbox_folder;
 }
 
 static int mboxdriver_initialize(mailsession * session)
 {
   struct mbox_session_state_data * data;
 
   data = malloc(sizeof(* data));
   if (data == NULL)
     goto err;
 
   data->mbox_folder = NULL;
 
   data->mbox_force_read_only = FALSE;
   data->mbox_force_no_uid = TRUE;
 
   session->sess_data = data;
   
   return MAIL_NO_ERROR;
 
  err:
   return MAIL_ERROR_MEMORY;
 }
 
 static void free_state(struct mbox_session_state_data * mbox_data)
@@ -299,96 +303,102 @@ static int mboxdriver_status_folder(mailsession * session, char * mb,
   * result_unseen = count;
   
   return MAIL_NO_ERROR;
 }
 
 static int mboxdriver_messages_number(mailsession * session, char * mb,
                                       uint32_t * result)
 {
   struct mailmbox_folder * folder;
   int r;
 
   folder = get_mbox_session(session);
   if (folder == NULL)
     return MAIL_ERROR_STATUS;
 
   r = mailmbox_validate_read_lock(folder);
   if (r != MAIL_NO_ERROR)
     return r;
 
   mailmbox_read_unlock(folder);
 
   * result = carray_count(folder->mb_tab) - folder->mb_deleted_count;
   
   return MAILMBOX_NO_ERROR;
 }
 
 /* messages operations */
 
 static int mboxdriver_append_message(mailsession * session,
                                      char * message, size_t size)
 {
   int r;
   struct mailmbox_folder * folder;
 
   folder = get_mbox_session(session);
   if (folder == NULL)
     return MAIL_ERROR_APPEND;
 
   r = mailmbox_append_message(folder, message, size);
 
   switch (r) {
   case MAILMBOX_ERROR_FILE:
     return MAIL_ERROR_DISKSPACE;
   default:
     return mboxdriver_mbox_error_to_mail_error(r);
   }
 }
 
+static int mboxdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  return mboxdriver_append_message(session, message, size);
+}
+
 static int mboxdriver_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_messages_list(folder, session, mbox_message_driver, result);
 
  err:
   return res;
 }
 
 static int
 mboxdriver_get_envelopes_list(mailsession * session,
                               struct mailmessage_list * env_list)
 {
   struct mailmbox_folder * folder;
   unsigned int i;
   int r;
   int res;
 
   folder = get_mbox_session(session);
   if (folder == NULL) {
     res = MAIL_ERROR_BAD_STATE;
     goto err;
   }
 
   r = mailmbox_validate_read_lock(folder);
   if (r != MAILMBOX_NO_ERROR) {
     res = mboxdriver_mbox_error_to_mail_error(r);
     goto err;
   }
 
   for(i = 0 ; i < carray_count(env_list->msg_tab) ; i ++) {
     mailmessage * msg;
     struct mailimf_fields * fields;
     char * headers;
     size_t headers_len;
     size_t cur_token;
 
     msg = carray_get(env_list->msg_tab, i);
     if (msg == NULL)