1 files changed, 26 insertions, 7 deletions

diff --git a/kmicromail/libetpan/maildir/maildir.c b/kmicromail/libetpan/maildir/maildir.c
index 320ef81..0e038b1 100644
--- a/kmicromail/libetpan/maildir/maildir.c
+++ b/kmicromail/libetpan/maildir/maildir.c
@@ -417,56 +417,58 @@ static char * libetpan_basename(char * filename)
   next = strchr(p, '/');
   
   while (next != NULL) {
     p = next;
     next = strchr(p + 1, '/');
   }
   
   if (p == filename)
     return filename;
   else
     return p + 1;
 }
 #else
 #define libetpan_basename(a) basename(a)
 #endif
 
-int maildir_message_add(struct maildir * md,
-    const char * message, size_t size)
+int maildir_message_add_uid(struct maildir * md,
+    const char * message, size_t size,
+    char * uid, size_t max_uid_len)
 {
   char path_new[PATH_MAX];
   char tmpname[PATH_MAX];
   int fd;
   int r;
   char * mapping;
   char * delivery_tmp_name;
   char * delivery_tmp_basename;
   char delivery_new_name[PATH_MAX];
   char * delivery_new_basename;
   int res;
   struct stat stat_info;
   
   r = maildir_update(md);
   if (r != MAILDIR_NO_ERROR) {
     res = r;
     goto err;
   }
 
   /* write to tmp/ with a classic temporary file */
 
-  snprintf(tmpname, sizeof(tmpname), "%s/tmp/etpan-maildir-XXXXXX", md->mdir_path);
+  snprintf(tmpname, sizeof(tmpname), "%s/tmp/etpan-maildir-XXXXXX",
+      md->mdir_path);
   fd = mkstemp(tmpname);
   if (fd < 0) {
     res = MAILDIR_ERROR_FILE;
     goto err;
   }
   
   r = ftruncate(fd, size);
   if (r < 0) {
     res = MAILDIR_ERROR_FILE;
     goto close;
   }
   
   mapping = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
   if (mapping == MAP_FAILED) {
     res = MAILDIR_ERROR_FILE;
     goto close;
@@ -508,70 +510,87 @@ int maildir_message_add(struct maildir * md,
   if (r < 0) {
     unlink(delivery_new_name);
     res = MAILDIR_ERROR_FILE;
     goto unlink_tmp;
   }
 
   md->mdir_mtime_new = stat_info.st_mtime;
   
   delivery_new_basename = libetpan_basename(delivery_new_name);
   
   r = add_message(md, delivery_new_basename, 1);
   if (r != MAILDIR_NO_ERROR) {
     unlink(delivery_new_name);
     res = MAILDIR_ERROR_FILE;
     goto unlink_tmp;
   }
-
+  
+  if (uid != NULL)
+    strncpy(uid, delivery_new_basename, max_uid_len);
+  
   unlink(delivery_tmp_name);
   free(delivery_tmp_name);
   
   return MAILDIR_NO_ERROR;
   
  unlink_tmp:
   unlink(delivery_tmp_name);
   free(delivery_tmp_name);
   goto err;
  close:
   close(fd);
  unlink:
   unlink(tmpname);
  err:
   return res;
 }
 
-int maildir_message_add_file(struct maildir * md, int fd)
+int maildir_message_add(struct maildir * md,
+    const char * message, size_t size)
+{
+  return maildir_message_add_uid(md, message, size,
+      NULL, 0);
+}
+
+int maildir_message_add_file_uid(struct maildir * md, int fd,
+    char * uid, size_t max_uid_len)
 {
   char * message;
   struct stat buf;
   int r;
   
   if (fstat(fd, &buf) == -1)
     return MAILDIR_ERROR_FILE;
   
   message = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
   if (message == MAP_FAILED)
     return MAILDIR_ERROR_FILE;
   
-  r = maildir_message_add(md, message, buf.st_size);
+  r = maildir_message_add_uid(md, message, buf.st_size, uid, max_uid_len);
   
   munmap(message, buf.st_size);
-
+  
   return r;
 }
 
+int maildir_message_add_file(struct maildir * md, int fd)
+{
+  return maildir_message_add_file_uid(md, fd,
+      NULL, 0);
+}
+
 char * maildir_message_get(struct maildir * md, const char * uid)
 {
   chashdatum key;
   chashdatum value;
   char filename[PATH_MAX];
   char * dup_filename;
   struct maildir_msg * msg;
   char * dir;
   int r;
   
   key.data = (void *) uid;
   key.len = strlen(uid);
   r = chash_get(md->mdir_msg_hash, &key, &value);
   if (r < 0)
     return NULL;