X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage-file.c;h=311bd478b0cfff13620ba653795ccb9cd62246bf;hp=b90df305b6306097b6d9708e33e2a64e1e74a69c;hb=HEAD;hpb=aa2abd2958f941caba6ffc8052dd00550f7e7e39 diff --git a/lib/message-file.c b/lib/message-file.c index b90df305..68f646a4 100644 --- a/lib/message-file.c +++ b/lib/message-file.c @@ -27,8 +27,8 @@ #include /* GHashTable */ struct _notmuch_message_file { - /* File object */ - FILE *file; + /* open stream to (possibly gzipped) file */ + GMimeStream *stream; char *filename; /* Cache for decoded headers */ @@ -46,8 +46,8 @@ _notmuch_message_file_destructor (notmuch_message_file_t *message) if (message->message) g_object_unref (message->message); - if (message->file) - fclose (message->file); + if (message->stream) + g_object_unref (message->stream); return 0; } @@ -64,22 +64,38 @@ _notmuch_message_file_open_ctx (notmuch_database_t *notmuch, if (unlikely (message == NULL)) return NULL; - /* Only needed for error messages during parsing. */ - message->filename = talloc_strdup (message, filename); + const char *prefix = notmuch_config_get (notmuch, NOTMUCH_CONFIG_MAIL_ROOT); + + if (prefix == NULL) + goto FAIL; + + if (*filename == '/') { + if (strncmp (filename, prefix, strlen (prefix)) != 0) { + _notmuch_database_log (notmuch, "Error opening %s: path outside mail root\n", + filename); + errno = 0; + goto FAIL; + } + message->filename = talloc_strdup (message, filename); + } else { + message->filename = talloc_asprintf (message, "%s/%s", prefix, filename); + } + if (message->filename == NULL) goto FAIL; talloc_set_destructor (message, _notmuch_message_file_destructor); - message->file = fopen (filename, "r"); - if (message->file == NULL) + message->stream = g_mime_stream_gzfile_open (message->filename); + if (message->stream == NULL) goto FAIL; return message; FAIL: - _notmuch_database_log (notmuch, "Error opening %s: %s\n", - filename, strerror (errno)); + if (errno) + _notmuch_database_log (notmuch, "Error opening %s: %s\n", + filename, strerror (errno)); _notmuch_message_file_close (message); return NULL; @@ -104,18 +120,18 @@ _notmuch_message_file_close (notmuch_message_file_t *message) talloc_free (message); } -static notmuch_bool_t -_is_mbox (FILE *file) +static bool +_is_mbox (GMimeStream *stream) { char from_buf[5]; - notmuch_bool_t ret = FALSE; + bool ret = false; /* Is this mbox? */ - if (fread (from_buf, sizeof (from_buf), 1, file) == 1 && + if (g_mime_stream_read (stream, from_buf, sizeof (from_buf)) == sizeof (from_buf) && strncmp (from_buf, "From ", 5) == 0) - ret = TRUE; + ret = true; - rewind (file); + g_mime_stream_reset (stream); return ret; } @@ -123,36 +139,26 @@ _is_mbox (FILE *file) notmuch_status_t _notmuch_message_file_parse (notmuch_message_file_t *message) { - GMimeStream *stream; GMimeParser *parser; notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; - static int initialized = 0; - notmuch_bool_t is_mbox; + bool is_mbox; if (message->message) return NOTMUCH_STATUS_SUCCESS; - is_mbox = _is_mbox (message->file); + is_mbox = _is_mbox (message->stream); - if (! initialized) { - g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS); - initialized = 1; - } + _notmuch_init (); message->headers = g_hash_table_new_full (strcase_hash, strcase_equal, free, g_free); if (! message->headers) return NOTMUCH_STATUS_OUT_OF_MEMORY; - stream = g_mime_stream_file_new (message->file); - - /* We'll own and fclose the FILE* ourselves. */ - g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE); - - parser = g_mime_parser_new_with_stream (stream); + parser = g_mime_parser_new_with_stream (message->stream); g_mime_parser_set_scan_from (parser, is_mbox); - message->message = g_mime_parser_construct_message (parser); + message->message = g_mime_parser_construct_message (parser, NULL); if (! message->message) { status = NOTMUCH_STATUS_FILE_NOT_EMAIL; goto DONE; @@ -167,7 +173,7 @@ _notmuch_message_file_parse (notmuch_message_file_t *message) } DONE: - g_object_unref (stream); + g_mime_stream_reset (message->stream); g_object_unref (parser); if (status) { @@ -179,7 +185,6 @@ _notmuch_message_file_parse (notmuch_message_file_t *message) message->message = NULL; } - rewind (message->file); } return status; @@ -209,10 +214,11 @@ _notmuch_message_file_get_mime_message (notmuch_message_file_t *message, */ static char * -_extend_header (char *combined, const char *value) { +_extend_header (char *combined, const char *value) +{ char *decoded; - decoded = g_mime_utils_header_decode_text (value); + decoded = g_mime_utils_header_decode_text (NULL, value); if (! decoded) { if (combined) { g_free (combined); @@ -234,51 +240,10 @@ _extend_header (char *combined, const char *value) { } else { combined = decoded; } - DONE: - return combined; -} - -#if (GMIME_MAJOR_VERSION < 3) -static char * -_notmuch_message_file_get_combined_header (notmuch_message_file_t *message, - const char *header) -{ - GMimeHeaderList *headers; - GMimeHeaderIter *iter; - char *combined = NULL; - - headers = g_mime_object_get_header_list (GMIME_OBJECT (message->message)); - if (! headers) - return NULL; - - iter = g_mime_header_iter_new (); - if (! iter) - return NULL; - - if (! g_mime_header_list_get_iter (headers, iter)) - goto DONE; - - do { - const char *value; - if (strcasecmp (g_mime_header_iter_get_name (iter), header) != 0) - continue; - - /* Note that GMime retains ownership of value... */ - value = g_mime_header_iter_get_value (iter); - - combined = _extend_header (combined, value); - } while (g_mime_header_iter_next (iter)); - - /* Return empty string for non-existing headers. */ - if (! combined) - combined = g_strdup (""); - DONE: - g_mime_header_iter_free (iter); - return combined; } -#else + static char * _notmuch_message_file_get_combined_header (notmuch_message_file_t *message, const char *header) @@ -291,7 +256,7 @@ _notmuch_message_file_get_combined_header (notmuch_message_file_t *message, return NULL; - for (int i=0; i < g_mime_header_list_get_count (headers); i++) { + for (int i = 0; i < g_mime_header_list_get_count (headers); i++) { const char *value; GMimeHeader *g_header = g_mime_header_list_get_header_at (headers, i); @@ -310,11 +275,10 @@ _notmuch_message_file_get_combined_header (notmuch_message_file_t *message, return combined; } -#endif const char * _notmuch_message_file_get_header (notmuch_message_file_t *message, - const char *header) + const char *header) { const char *value; char *decoded; @@ -327,18 +291,23 @@ _notmuch_message_file_get_header (notmuch_message_file_t *message, if (value) return value; - if (strcasecmp (header, "received") == 0) { + if (strcasecmp (header, "received") == 0 || + strcasecmp (header, "delivered-to") == 0) { /* - * The Received: header is special. We concatenate all - * instances of the header as we use this when analyzing the - * path the mail has taken from sender to recipient. + * The Received: header is special. We concatenate all instances of the + * header as we use this when analyzing the path the mail has taken + * from sender to recipient. + * + * Similarly, multiple instances of Delivered-To may be present. We + * concatenate them so the one with highest priority may be picked (eg. + * primary_email before other_email). */ decoded = _notmuch_message_file_get_combined_header (message, header); } else { value = g_mime_object_get_header (GMIME_OBJECT (message->message), header); if (value) - decoded = g_mime_utils_header_decode_text (value); + decoded = g_mime_utils_header_decode_text (NULL, value); else decoded = g_strdup (""); } @@ -416,7 +385,7 @@ _notmuch_message_file_get_headers (notmuch_message_file_t *message_file, message_id = talloc_asprintf (message_file, "notmuch-sha1-%s", sha1); free (sha1); } - DONE: + DONE: if (ret == NOTMUCH_STATUS_SUCCESS) { if (from_out) *from_out = from;