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
@@ -427,14 +427,15 @@ static char * libetpan_basename(char * filename)
     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;
@@ -450,13 +451,14 @@ int maildir_message_add(struct maildir * md,
     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;
   }
   
@@ -518,13 +520,16 @@ int maildir_message_add(struct maildir * md,
   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:
@@ -536,32 +541,46 @@ int maildir_message_add(struct maildir * md,
  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;