Mail fixes and libetpan updated

1 files changed, 18 insertions, 3 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
@@ -188,24 +188,27 @@ void mailmbox_timestamp(struct mailmbox_folder * folder)
     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;
   }
 
@@ -608,24 +611,26 @@ mailmbox_append_message_list_no_lock(struct mailmbox_folder * folder,
   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 --;
     }
@@ -735,26 +740,26 @@ mailmbox_append_message_list(struct mailmbox_folder * 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;
   }
 
@@ -762,38 +767,48 @@ mailmbox_append_message(struct mailmbox_folder * folder,
   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;