author | zautrix <zautrix> | 2004-09-01 10:23:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-01 10:23:29 (UTC) |
commit | 6cefbdc9c8f3f3001373f10715361e2740c45395 (patch) (unidiff) | |
tree | cb2c36f57620e698913c27ca4ebe59e4a7c9d46e /kmicromail/libetpan/maildir/maildir.c | |
parent | b9257cb225cd29bab5d96fcdaf557926603ee587 (diff) | |
download | kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.zip kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.tar.gz kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.tar.bz2 |
Mail fixes and libetpan updated
Diffstat (limited to 'kmicromail/libetpan/maildir/maildir.c') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libetpan/maildir/maildir.c | 33 |
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 | |||
@@ -432,4 +432,5 @@ static char * libetpan_basename(char * filename) | |||
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 | { |
@@ -455,3 +456,4 @@ int maildir_message_add(struct maildir * md, | |||
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); |
@@ -523,3 +525,6 @@ 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); |
@@ -541,3 +546,11 @@ int maildir_message_add(struct maildir * md, | |||
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 | { |
@@ -554,6 +567,6 @@ int maildir_message_add_file(struct maildir * md, int fd) | |||
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); |
558 | 571 | ||
559 | return r; | 572 | return r; |
@@ -561,2 +574,8 @@ int maildir_message_add_file(struct maildir * md, int fd) | |||
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) |