diff options
| author |  Carl Worth <cworth@cworth.org> | 2009-11-20 21:46:37 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-11-20 21:46:37 +0100 |
| commit | 3ae12b1e286d1c0041a2e3957cb01daa2981dad9 (patch) | |
| tree | 156699c0a9cc0f62cb9ef533e5b791efd9235b4a /lib | |
| parent | 656e4c413d84984dcc5fbd8016907ed03c343cb8 (diff) | |
add_message: Re-fix handling of non-mail files.
More fallout from _get_header now returning "" for missing headers.
The bug here is that we would no longer detect that a file is not an
email message and give up on it like we should.
And this time, I actually audited all callers to
notmuch_message_get_header, so hopefully we're done fixing this
bug over and over.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/database.cc | 10 | ||||
| -rw-r--r-- | lib/message.cc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/database.cc b/lib/database.cc index 58a350d2..207246cc 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -323,7 +323,7 @@ _parse_message_id (void *ctx, const char *message_id, const char **next) const char *s, *end; char *result; - if (message_id == NULL) + if (message_id == NULL || *message_id == '\0') return NULL; s = message_id; @@ -391,7 +391,7 @@ parse_references (void *ctx, { char *ref; - if (refs == NULL) + if (refs == NULL || *refs == '\0') return; while (*refs) { @@ -896,9 +896,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch, subject = notmuch_message_file_get_header (message_file, "subject"); to = notmuch_message_file_get_header (message_file, "to"); - if (from == NULL && - subject == NULL && - to == NULL) + if ((from == NULL || *from == '\0') && + (subject == NULL || *subject == '\0') && + (to == NULL || *to == '\0')) { ret = NOTMUCH_STATUS_FILE_NOT_EMAIL; goto DONE; diff --git a/lib/message.cc b/lib/message.cc index 41dddd07..e0b8a8e1 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -491,7 +491,7 @@ _notmuch_message_set_date (notmuch_message_t *message, /* GMime really doesn't want to see a NULL date, so protect its * sensibilities. */ - if (date == NULL) + if (date == NULL || *date == '\0') time_value = 0; else time_value = g_mime_utils_header_decode_date (date, NULL); |