notmuch_database_add_message: Add missing error-value propagation.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 07a2bdd60eac7a8b51dd8ceeda7de4791d1d6652..58a350d2f59e8368006d681a2508d20453b2254b 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -42,7 +42,8 @@ typedef struct {
  * Mail document
  * -------------
  * A mail document is associated with a particular email message file
- * on disk. It is indexed with the following prefixed terms:
+ * on disk. It is indexed with the following prefixed terms which the
+ * database uses to construct threads, etc.:
  *
  *    Single terms of given prefix:
  *
@@ -53,15 +54,14 @@ typedef struct {
  *
  *     thread: The ID of the thread to which the mail belongs
  *
+ *     replyto: The ID from the In-Reply-To header of the mail (if any).
+ *
  *    Multiple terms of given prefix:
  *
- *     ref:    All unresolved message IDs from In-Reply-To and
- *             References headers in the message. (Once a referenced
- *             message is added to the database and the thread IDs
- *             are linked the corresponding "ref" term is dropped
- *             from the message document.)
+ *     reference: All message IDs from In-Reply-To and Re ferences
+ *                headers in the message.
  *
- *     tag:    Any tags associated with this message by the user.
+ *     tag:       Any tags associated with this message by the user.
  *
  *    A mail document also has two values:
  *
@@ -70,6 +70,11 @@ typedef struct {
  *
  *     MESSAGE_ID:     The unique ID of the mail mess (see "id" above)
  *
+ * In addition, terms from the content of the message are added with
+ * "from", "to", "attachment", and "subject" prefixes for use by the
+ * user in searching. But the database doesn't really care itself
+ * about any of these.
+ *
  * Timestamp document
  * ------------------
  * A timestamp document is used by a client of the notmuch library to
@@ -104,7 +109,7 @@ typedef struct {
 
 prefix_t BOOLEAN_PREFIX_INTERNAL[] = {
     { "type", "T" },
-    { "ref", "XREFERENCE" },
+    { "reference", "XREFERENCE" },
     { "replyto", "XREPLYTO" },
     { "timestamp", "XTIMESTAMP" },
 };
@@ -180,7 +185,7 @@ notmuch_status_to_string (notmuch_status_t status)
     case NOTMUCH_STATUS_TAG_TOO_LONG:
        return "Tag value is too long (exceeds NOTMUCH_TAG_MAX)";
     case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:
-       return "Unblanced number of calls to notmuch_message_freeze/thaw";
+       return "Unbalanced number of calls to notmuch_message_freeze/thaw";
     default:
     case NOTMUCH_STATUS_LAST_STATUS:
        return "Unknown error status value";
@@ -312,7 +317,7 @@ skip_space_and_comments (const char **str)
  * Returns a newly talloc'ed string belonging to 'ctx'.
  *
  * Returns NULL if there is any error parsing the message-id. */
-char *
+static char *
 _parse_message_id (void *ctx, const char *message_id, const char **next)
 {
     const char *s, *end;
@@ -721,7 +726,8 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
 
     /* Carefully avoid adding any self-referential in-reply-to term. */
     in_reply_to_message_id = _parse_message_id (message, in_reply_to, NULL);
-    if (strcmp (in_reply_to_message_id,
+    if (in_reply_to_message_id &&
+       strcmp (in_reply_to_message_id,
                notmuch_message_get_message_id (message)))
     {
        _notmuch_message_add_term (message, "replyto",
@@ -739,7 +745,8 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
                                                             parent_message_id);
 
        if (parent_thread_id == NULL) {
-           _notmuch_message_add_term (message, "ref", parent_message_id);
+           _notmuch_message_add_term (message, "reference",
+                                      parent_message_id);
        } else {
            if (*thread_id == NULL) {
                *thread_id = talloc_strdup (message, parent_thread_id);
@@ -773,7 +780,7 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch,
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
     notmuch_private_status_t private_status;
 
-    find_doc_ids (notmuch, "ref", message_id, &child, &children_end);
+    find_doc_ids (notmuch, "reference", message_id, &child, &children_end);
 
     for ( ; child != children_end; child++) {
 
@@ -790,7 +797,7 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch,
            *thread_id = talloc_strdup (message, child_thread_id);
            _notmuch_message_add_term (message, "thread", *thread_id);
        } else if (strcmp (*thread_id, child_thread_id)) {
-           _notmuch_message_remove_term (child_message, "ref",
+           _notmuch_message_remove_term (child_message, "reference",
                                          message_id);
            _notmuch_message_sync (child_message);
            ret = _merge_threads (notmuch, *thread_id, child_thread_id);
@@ -901,7 +908,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
         * is to find a message ID (or else create one ourselves). */
 
        header = notmuch_message_file_get_header (message_file, "message-id");
-       if (header) {
+       if (header && *header != '\0') {
            message_id = _parse_message_id (message_file, header, NULL);
            /* So the header value isn't RFC-compliant, but it's
             * better than no message-id at all. */
@@ -933,8 +940,11 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
        talloc_free (message_id);
 
-       if (message == NULL)
+       if (message == NULL) {
+           ret = COERCE_STATUS (private_status,
+                                "Unexpected status value from _notmuch_message_create_for_message_id");
            goto DONE;
+       }
 
        /* Is this a newly created message object? */
        if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {