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 | |
parent | b9257cb225cd29bab5d96fcdaf557926603ee587 (diff) | |
download | kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.zip kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.tar.gz kdepimpi-6cefbdc9c8f3f3001373f10715361e2740c45395.tar.bz2 |
Mail fixes and libetpan updated
-rw-r--r-- | kmicromail/libetpan/maildir/maildir.c | 33 | ||||
-rw-r--r-- | kmicromail/libetpan/maildir/maildir.h | 7 |
2 files changed, 33 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 | |||
@@ -429,10 +429,11 @@ static char * libetpan_basename(char * filename) | |||
429 | #else | 429 | #else |
430 | #define libetpan_basename(a) basename(a) | 430 | #define libetpan_basename(a) basename(a) |
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]; |
437 | char tmpname[PATH_MAX]; | 438 | char tmpname[PATH_MAX]; |
438 | int fd; | 439 | int fd; |
@@ -452,9 +453,10 @@ int maildir_message_add(struct maildir * md, | |||
452 | } | 453 | } |
453 | 454 | ||
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) { |
459 | res = MAILDIR_ERROR_FILE; | 461 | res = MAILDIR_ERROR_FILE; |
460 | goto err; | 462 | goto err; |
@@ -520,9 +522,12 @@ int maildir_message_add(struct maildir * md, | |||
520 | unlink(delivery_new_name); | 522 | unlink(delivery_new_name); |
521 | res = MAILDIR_ERROR_FILE; | 523 | res = MAILDIR_ERROR_FILE; |
522 | goto unlink_tmp; | 524 | goto unlink_tmp; |
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); |
527 | 532 | ||
528 | return MAILDIR_NO_ERROR; | 533 | return MAILDIR_NO_ERROR; |
@@ -538,9 +543,17 @@ int maildir_message_add(struct maildir * md, | |||
538 | err: | 543 | err: |
539 | return res; | 544 | return res; |
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; |
545 | struct stat buf; | 558 | struct stat buf; |
546 | int r; | 559 | int r; |
@@ -551,15 +564,21 @@ int maildir_message_add_file(struct maildir * md, int fd) | |||
551 | message = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); | 564 | message = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); |
552 | if (message == MAP_FAILED) | 565 | if (message == MAP_FAILED) |
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); |
558 | 571 | ||
559 | return r; | 572 | return r; |
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 | { |
564 | chashdatum key; | 583 | chashdatum key; |
565 | chashdatum value; | 584 | chashdatum value; |
diff --git a/kmicromail/libetpan/maildir/maildir.h b/kmicromail/libetpan/maildir/maildir.h index b782484..268dda1 100644 --- a/kmicromail/libetpan/maildir/maildir.h +++ b/kmicromail/libetpan/maildir/maildir.h | |||
@@ -44,11 +44,18 @@ struct maildir * maildir_new(const char * path); | |||
44 | void maildir_free(struct maildir * md); | 44 | void maildir_free(struct maildir * md); |
45 | 45 | ||
46 | int maildir_update(struct maildir * md); | 46 | int maildir_update(struct maildir * md); |
47 | 47 | ||
48 | int maildir_message_add_uid(struct maildir * md, | ||
49 | const char * message, size_t size, | ||
50 | char * uid, size_t max_uid_len); | ||
51 | |||
48 | int maildir_message_add(struct maildir * md, | 52 | int maildir_message_add(struct maildir * md, |
49 | const char * message, size_t size); | 53 | const char * message, size_t size); |
50 | 54 | ||
55 | int maildir_message_add_file_uid(struct maildir * md, int fd, | ||
56 | char * uid, size_t max_uid_len); | ||
57 | |||
51 | int maildir_message_add_file(struct maildir * md, int fd); | 58 | int maildir_message_add_file(struct maildir * md, int fd); |
52 | 59 | ||
53 | char * maildir_message_get(struct maildir * md, const char * uid); | 60 | char * maildir_message_get(struct maildir * md, const char * uid); |
54 | 61 | ||