Diffstat (limited to 'kmicromail/libetpan/maildir/maildir.c') (more/less context) (show whitespace changes)
-rw-r--r-- | kmicromail/libetpan/maildir/maildir.c | 29 |
1 files changed, 24 insertions, 5 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 | |||
@@ -431,6 +431,7 @@ static char * libetpan_basename(char * filename) | |||
431 | #endif | 431 | #endif |
432 | 432 | ||
433 | int maildir_message_add(struct maildir * md, | 433 | int maildir_message_add_uid(struct maildir * md, |
434 | const char * message, size_t size) | 434 | const char * message, size_t size, |
435 | char * uid, size_t max_uid_len) | ||
435 | { | 436 | { |
436 | char path_new[PATH_MAX]; | 437 | char path_new[PATH_MAX]; |
@@ -454,5 +455,6 @@ int maildir_message_add(struct maildir * md, | |||
454 | /* write to tmp/ with a classic temporary file */ | 455 | /* write to tmp/ with a classic temporary file */ |
455 | 456 | ||
456 | snprintf(tmpname, sizeof(tmpname), "%s/tmp/etpan-maildir-XXXXXX", md->mdir_path); | 457 | snprintf(tmpname, sizeof(tmpname), "%s/tmp/etpan-maildir-XXXXXX", |
458 | md->mdir_path); | ||
457 | fd = mkstemp(tmpname); | 459 | fd = mkstemp(tmpname); |
458 | if (fd < 0) { | 460 | if (fd < 0) { |
@@ -523,4 +525,7 @@ int maildir_message_add(struct maildir * md, | |||
523 | } | 525 | } |
524 | 526 | ||
527 | if (uid != NULL) | ||
528 | strncpy(uid, delivery_new_basename, max_uid_len); | ||
529 | |||
525 | unlink(delivery_tmp_name); | 530 | unlink(delivery_tmp_name); |
526 | free(delivery_tmp_name); | 531 | free(delivery_tmp_name); |
@@ -540,5 +545,13 @@ int maildir_message_add(struct maildir * md, | |||
540 | } | 545 | } |
541 | 546 | ||
542 | int maildir_message_add_file(struct maildir * md, int fd) | 547 | int maildir_message_add(struct maildir * md, |
548 | const char * message, size_t size) | ||
549 | { | ||
550 | return maildir_message_add_uid(md, message, size, | ||
551 | NULL, 0); | ||
552 | } | ||
553 | |||
554 | int maildir_message_add_file_uid(struct maildir * md, int fd, | ||
555 | char * uid, size_t max_uid_len) | ||
543 | { | 556 | { |
544 | char * message; | 557 | char * message; |
@@ -553,5 +566,5 @@ int maildir_message_add_file(struct maildir * md, int fd) | |||
553 | return MAILDIR_ERROR_FILE; | 566 | return MAILDIR_ERROR_FILE; |
554 | 567 | ||
555 | r = maildir_message_add(md, message, buf.st_size); | 568 | r = maildir_message_add_uid(md, message, buf.st_size, uid, max_uid_len); |
556 | 569 | ||
557 | munmap(message, buf.st_size); | 570 | munmap(message, buf.st_size); |
@@ -560,4 +573,10 @@ int maildir_message_add_file(struct maildir * md, int fd) | |||
560 | } | 573 | } |
561 | 574 | ||
575 | int maildir_message_add_file(struct maildir * md, int fd) | ||
576 | { | ||
577 | return maildir_message_add_file_uid(md, fd, | ||
578 | NULL, 0); | ||
579 | } | ||
580 | |||
562 | char * maildir_message_get(struct maildir * md, const char * uid) | 581 | char * maildir_message_get(struct maildir * md, const char * uid) |
563 | { | 582 | { |