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
@@ -152,96 +152,99 @@ int mailmbox_map(struct mailmbox_folder * folder)
   }
   
   folder->mb_mapping = str;
   folder->mb_mapping_size = buf.st_size;
 
   return MAILMBOX_NO_ERROR;
 
  err:
   return res;
 }
 
 /*
   unmap the file
 */
 
 void mailmbox_unmap(struct mailmbox_folder * folder)
 {
   munmap(folder->mb_mapping, folder->mb_mapping_size);
   folder->mb_mapping = NULL;
   folder->mb_mapping_size = 0;
 }
 
 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)
 {
   close(folder->mb_fd);
   folder->mb_fd = -1;
 }
 
 
 static int mailmbox_validate_lock(struct mailmbox_folder * folder,
     int (* custom_lock)(struct mailmbox_folder *),
     int (* custom_unlock)(struct mailmbox_folder *))
 {
   struct stat buf;
   int res;
   int r;
 
   r = stat(folder->mb_filename, &buf);
   if (r < 0) {
     buf.st_mtime = (time_t) -1;
   }
 
   if ((buf.st_mtime != folder->mb_mtime) ||
       ((size_t) buf.st_size != folder->mb_mapping_size)) {
     int r;
 
     mailmbox_unmap(folder);
     mailmbox_close(folder);
@@ -572,96 +575,98 @@ static char * write_fixed_message(char * str,
     left -= count;
   }
 
   return str;
 }
 
 #define DEFAULT_FROM_LINE "From - Wed Jun 30 21:49:08 1993\n"
 
 int
 mailmbox_append_message_list_no_lock(struct mailmbox_folder * folder,
 				     carray * append_tab)
 {
   size_t extra_size;
   int r;
   char from_line[MAX_FROM_LINE_SIZE] = DEFAULT_FROM_LINE;
   struct tm time_info;
   time_t date;
   int res;
   size_t old_size;
   char * str;
   unsigned int i;
   size_t from_size;
   size_t maxuid;
   size_t left;
   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)
       extra_size += (2 - crlf_count) * 2;
   }
 
   r = ftruncate(folder->mb_fd, extra_size + old_size);
   if (r < 0) {
     mailmbox_map(folder);
     res = MAILMBOX_ERROR_FILE;
     goto err;
   }
 
   r = mailmbox_map(folder);
   if (r < 0) {
     ftruncate(folder->mb_fd, old_size);
     return MAILMBOX_ERROR_FILE;
   }
 
   str = folder->mb_mapping + old_size;
 
   if (old_size != 0) {
     for(i = 0 ; i < 2 - crlf_count ; i ++) {
       * str = '\r';
       str ++;
       * str = '\n';
       str ++;
@@ -699,137 +704,147 @@ int
 mailmbox_append_message_list(struct mailmbox_folder * folder,
 			     carray * append_tab)
 {
   int r;
   int res;
   size_t cur_token;
 
   r = mailmbox_validate_write_lock(folder);
   if (r != MAILMBOX_NO_ERROR) {
     res = r;
     goto err;
   }
 
   r = mailmbox_expunge_no_lock(folder);
   if (r != MAILMBOX_NO_ERROR) {
     res = r;
     goto unlock;
   }
 
   cur_token = folder->mb_mapping_size;
 
   r = mailmbox_append_message_list_no_lock(folder, append_tab);
   if (r != MAILMBOX_NO_ERROR) {
     res = r;
     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) {
     res = MAILMBOX_ERROR_MSG_NOT_FOUND;
     goto err;
   }
 
   * result = folder->mb_mapping + info->msg_headers;
   * result_len = info->msg_size - info->msg_start_len;
 
   return MAILMBOX_NO_ERROR;
 
  err:
   return res;
 }
 
 int mailmbox_fetch_msg_headers_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;
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
@@ -6,96 +6,100 @@
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the libEtPan! project nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $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,
 		  int force_no_uid,
 		  uint32_t default_written_uid,
 		  struct mailmbox_folder ** result_folder);
 
 void mailmbox_done(struct mailmbox_folder * folder);
 
 /* low-level access primitives */
 
 int mailmbox_write_lock(struct mailmbox_folder * folder);
 
 int mailmbox_write_unlock(struct mailmbox_folder * folder);
 
 int mailmbox_read_lock(struct mailmbox_folder * folder);
 
 int mailmbox_read_unlock(struct mailmbox_folder * folder);
 
 
 /* memory map */
 
 int mailmbox_map(struct mailmbox_folder * folder);
 
 void mailmbox_unmap(struct mailmbox_folder * folder);
 
 void mailmbox_sync(struct mailmbox_folder * folder);
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
@@ -133,97 +133,98 @@ mailmbox_msg_info_new(size_t msg_start, size_t msg_start_len,
 
   info = malloc(sizeof(* info));
   if (info == NULL)
     return NULL;
 
   info->msg_index = 0;
   info->msg_uid = msg_uid;
   if (msg_uid != 0)
     info->msg_written_uid = TRUE;
   else
     info->msg_written_uid = FALSE;
   info->msg_deleted = FALSE;
 
   info->msg_start = msg_start;
   info->msg_start_len = msg_start_len;
 
   info->msg_headers = msg_headers;
   info->msg_headers_len = msg_headers_len;
 
   info->msg_body = msg_body;
   info->msg_body_len = msg_body_len;
 
   info->msg_size = msg_size;
 
   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;
 
   folder->mb_changed = FALSE;
   folder->mb_deleted_count = 0;
   
   folder->mb_mapping = NULL;
   folder->mb_mapping_size = 0;
 
   folder->mb_written_uid = 0;
   folder->mb_max_uid = 0;
 
   folder->mb_hash = chash_new(CHASH_DEFAULTSIZE, CHASH_COPYKEY);
   if (folder->mb_hash == NULL)
     goto free;
   
   folder->mb_tab = carray_new(128);
   if (folder->mb_tab == NULL)
     goto free_hash;
 
   return folder;
 
  free_hash:
   chash_free(folder->mb_hash);
  free:
   free(folder);
  err:
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
@@ -83,60 +83,61 @@ struct mailmbox_folder {
   chash * mb_hash;
   carray * mb_tab;
 };
 
 struct mailmbox_folder * mailmbox_folder_new(const char * mb_filename);
 void mailmbox_folder_free(struct mailmbox_folder * folder);
 
 
 struct mailmbox_msg_info {
   unsigned int msg_index;
   uint32_t msg_uid;
   int msg_written_uid;
   int msg_deleted;
 
   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;
 };
 
 
 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