4 files changed, 25 insertions, 4 deletions

diff --git a/kmicromail/libetpan/mbox/mailmbox.c b/kmicromail/libetpan/mbox/mailmbox.c
index 280c313..b3fce02 100644
--- a/kmicromail/libetpan/mbox/mailmbox.c
+++ b/kmicromail/libetpan/mbox/mailmbox.c
@@ -176,48 +176,51 @@ void mailmbox_sync(struct mailmbox_folder * folder)
   msync(folder->mb_mapping, folder->mb_mapping_size, MS_SYNC);
 }
 
 void mailmbox_timestamp(struct mailmbox_folder * folder)
 {
   int r;
   struct stat buf;
 
   r = stat(folder->mb_filename, &buf);
   if (r < 0)
     folder->mb_mtime = (time_t) -1;
   else
     folder->mb_mtime = buf.st_mtime;
 }
 
 /*
   open the file
 */
 
 int mailmbox_open(struct mailmbox_folder * folder)
 {
   int fd;
   int read_only;
 
+  fd = -1;
+  read_only = TRUE;
+
   if (!folder->mb_read_only) {
     read_only = FALSE;
     fd = open(folder->mb_filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
   }
 
   if (folder->mb_read_only || (fd < 0)) {
     read_only = TRUE;
     fd = open(folder->mb_filename, O_RDONLY);
     if (fd < 0)
       return MAILMBOX_ERROR_FILE_NOT_FOUND;
   }
 
   folder->mb_fd = fd;
   folder->mb_read_only = read_only;
 
   return MAILMBOX_NO_ERROR;
 }
 
 /*
   close the file
 */
 
 void mailmbox_close(struct mailmbox_folder * folder)
 {
@@ -596,48 +599,50 @@ mailmbox_append_message_list_no_lock(struct mailmbox_folder * folder,
   size_t crlf_count;
 
   if (folder->mb_read_only) {
     res = MAILMBOX_ERROR_READONLY;
     goto err;
   }
 
   date = time(NULL);
   from_size = strlen(DEFAULT_FROM_LINE);
   if (localtime_r(&date, &time_info) != NULL)
     from_size = strftime(from_line, MAX_FROM_LINE_SIZE, "From - %c\n", &time_info);
 
   maxuid = /* */ folder->mb_max_uid;
 
   extra_size = 0;
   for(i = 0 ; i < carray_count(append_tab) ; i ++) {
     struct mailmbox_append_info * info;
 
     info = carray_get(append_tab, i);
     extra_size += from_size;
     extra_size += get_fixed_message_size(info->ai_message, info->ai_size,
         folder->mb_max_uid + i + 1,
         folder->mb_no_uid);
     extra_size += 2; /* CR LF */
+    
+    info->ai_uid = folder->mb_max_uid + i + 1;
   }
 
   left = folder->mb_mapping_size;
   crlf_count = 0;
   while (left >= 1) {
     if (folder->mb_mapping[left - 1] == '\n') {
       crlf_count ++;
       left --;
     }
     else if (folder->mb_mapping[left - 1] == '\r') {
       left --;
     }
     else
       break;
 
     if (crlf_count == 2)
       break;
   }
 
   old_size = folder->mb_mapping_size;
   mailmbox_unmap(folder);
 
   if (old_size != 0) {
     if (crlf_count != 2)
@@ -723,89 +728,99 @@ mailmbox_append_message_list(struct mailmbox_folder * folder,
     goto unlock;
   }
 
   mailmbox_sync(folder);
 
   r = mailmbox_parse_additionnal(folder, &cur_token);
   if (r != MAILMBOX_NO_ERROR) {
     res = r;
     goto unlock;
   }
 
   mailmbox_timestamp(folder);
 
   mailmbox_write_unlock(folder);
 
   return MAILMBOX_NO_ERROR;
 
  unlock:
   mailmbox_write_unlock(folder);
  err:
   return res;
 }
 
 int
-mailmbox_append_message(struct mailmbox_folder * folder,
-                        const char * data, size_t len)
+mailmbox_append_message_uid(struct mailmbox_folder * folder,
+    const char * data, size_t len, unsigned int * puid)
 {
   carray * tab;
   struct mailmbox_append_info * append_info;
   int res;
   int r;
 
   tab = carray_new(1);
   if (tab == NULL) {
     res = MAILMBOX_ERROR_MEMORY;
     goto err;
   }
 
   append_info = mailmbox_append_info_new(data, len);
   if (append_info == NULL) {
     res = MAILMBOX_ERROR_MEMORY;
     goto free_list;
   }
 
   r = carray_add(tab, append_info, NULL);
   if (r < 0) {
     res = MAILMBOX_ERROR_MEMORY;
     goto free_append_info;
   }
 
   r = mailmbox_append_message_list(folder, tab);
-
+  
+  if (puid != NULL)
+    * puid = append_info->ai_uid;
+  
   mailmbox_append_info_free(append_info);
   carray_free(tab);
 
   return r;
 
  free_append_info:
   mailmbox_append_info_free(append_info);
  free_list:
   carray_free(tab);
  err:
   return res;
 }
 
+int
+mailmbox_append_message(struct mailmbox_folder * folder,
+    const char * data, size_t len)
+{
+  return mailmbox_append_message_uid(folder, data, len, NULL);
+}
+
 /* ********************************************************************** */
 
 int mailmbox_fetch_msg_no_lock(struct mailmbox_folder * folder,
                                uint32_t num, char ** result,
                                size_t * result_len)
 {
   struct mailmbox_msg_info * info;
   int res;
   chashdatum key;
   chashdatum data;
   int r;
   
   key.data = &num;
   key.len = sizeof(num);
   
   r = chash_get(folder->mb_hash, &key, &data);
   if (r < 0) {
     res = MAILMBOX_ERROR_MSG_NOT_FOUND;
     goto err;
   }
   
   info = data.data;
   
   if (info->msg_deleted) {
diff --git a/kmicromail/libetpan/mbox/mailmbox.h b/kmicromail/libetpan/mbox/mailmbox.h
index 8be086c..0427f1f 100644
--- a/kmicromail/libetpan/mbox/mailmbox.h
+++ b/kmicromail/libetpan/mbox/mailmbox.h
@@ -30,48 +30,52 @@
  */
 
 /*
  * $Id$
  */
 
 #ifndef MAILMBOX_H
 
 #define MAILMBOX_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include <libetpan/mailmbox_types.h>
 
 int
 mailmbox_append_message_list(struct mailmbox_folder * folder,
                              carray * append_tab);
 
 int
 mailmbox_append_message(struct mailmbox_folder * folder,
                         const char * data, size_t len);
 
+int
+mailmbox_append_message_uid(struct mailmbox_folder * folder,
+    const char * data, size_t len, unsigned int * puid);
+
 int mailmbox_fetch_msg(struct mailmbox_folder * folder,
                        uint32_t num, char ** result,
                        size_t * result_len);
 
 int mailmbox_fetch_msg_headers(struct mailmbox_folder * folder,
                                uint32_t num, char ** result,
                                size_t * result_len);
 
 void mailmbox_fetch_result_free(char * msg);
 
 int mailmbox_copy_msg_list(struct mailmbox_folder * dest_folder,
                            struct mailmbox_folder * src_folder,
                            carray * tab);
 
 int mailmbox_copy_msg(struct mailmbox_folder * dest_folder,
                       struct mailmbox_folder * src_folder,
                       uint32_t uid);
 
 int mailmbox_expunge(struct mailmbox_folder * folder);
 
 int mailmbox_delete_msg(struct mailmbox_folder * folder, uint32_t uid);
 
 int mailmbox_init(const char * filename,
                   int force_readonly,
diff --git a/kmicromail/libetpan/mbox/mailmbox_types.c b/kmicromail/libetpan/mbox/mailmbox_types.c
index 1986182..4e3e521 100644
--- a/kmicromail/libetpan/mbox/mailmbox_types.c
+++ b/kmicromail/libetpan/mbox/mailmbox_types.c
@@ -157,49 +157,50 @@ mailmbox_msg_info_new(size_t msg_start, size_t msg_start_len,
   info->msg_padding = msg_padding;
 
   return info;
 }
 
 void mailmbox_msg_info_free(struct mailmbox_msg_info * info)
 {
   free(info);
 }
 
 
 /* append info */
 
 struct mailmbox_append_info *
 mailmbox_append_info_new(const char * ai_message, size_t ai_size)
 {
   struct mailmbox_append_info * info;
 
   info = malloc(sizeof(* info));
   if (info == NULL)
     return NULL;
 
   info->ai_message = ai_message;
   info->ai_size = ai_size;
-
+  info->ai_uid = 0;
+  
   return info;
 }
 
 void mailmbox_append_info_free(struct mailmbox_append_info * info)
 {
   free(info);
 }
 
 struct mailmbox_folder * mailmbox_folder_new(const char * mb_filename)
 {
   struct mailmbox_folder * folder;
 
   folder = malloc(sizeof(* folder));
   if (folder == NULL)
     goto err;
 
   strncpy(folder->mb_filename, mb_filename, PATH_MAX);
 
   folder->mb_mtime = (time_t) -1;
 
   folder->mb_fd = -1;
   folder->mb_read_only = TRUE;
   folder->mb_no_uid = TRUE;
 
diff --git a/kmicromail/libetpan/mbox/mailmbox_types.h b/kmicromail/libetpan/mbox/mailmbox_types.h
index dd6758c..bd6ee30 100644
--- a/kmicromail/libetpan/mbox/mailmbox_types.h
+++ b/kmicromail/libetpan/mbox/mailmbox_types.h
@@ -107,36 +107,37 @@ struct mailmbox_msg_info {
 
   size_t msg_padding;
 };
 
 
 int mailmbox_msg_info_update(struct mailmbox_folder * folder,
                              size_t msg_start, size_t msg_start_len,
                              size_t msg_headers, size_t msg_headers_len,
                              size_t msg_body, size_t msg_body_len,
                              size_t msg_size, size_t msg_padding,
                              uint32_t msg_uid);
 
 struct mailmbox_msg_info *
 mailmbox_msg_info_new(size_t msg_start, size_t msg_start_len,
                       size_t msg_headers, size_t msg_headers_len,
                       size_t msg_body, size_t msg_body_len,
                       size_t msg_size, size_t msg_padding,
                       uint32_t msg_uid);
 
 void mailmbox_msg_info_free(struct mailmbox_msg_info * info);
 
 struct mailmbox_append_info {
   const char * ai_message;
   size_t ai_size;
+  unsigned int ai_uid;
 };
 
 struct mailmbox_append_info *
 mailmbox_append_info_new(const char * ai_message, size_t ai_size);
 
 void mailmbox_append_info_free(struct mailmbox_append_info * info);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif