Remove the talloc_owner argument from create_for_message_id.

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index a4b090ba698f8867e350220f45e453cad753538f..c3eb2e6ec9b618c77a119423c9ad98730d9c348b 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -33,6 +33,7 @@ struct _notmuch_message {
     int frozen;
     char *message_id;
     char *thread_id;
+    char *in_reply_to;
     char *filename;
     notmuch_message_file_t *message_file;
     notmuch_message_list_t *replies;
@@ -111,6 +112,7 @@ _notmuch_message_create (const void *talloc_owner,
     /* Each of these will be lazily created as needed. */
     message->message_id = NULL;
     message->thread_id = NULL;
+    message->in_reply_to = NULL;
     message->filename = NULL;
     message->message_file = NULL;
 
@@ -146,15 +148,8 @@ _notmuch_message_create (const void *talloc_owner,
 /* Create a new notmuch_message_t object for a specific message ID,
  * (which may or may not already exist in the databas).
  *
- * Here, 'talloc owner' is an optional talloc context to which the new
- * message will belong. This allows for the caller to not bother
- * calling notmuch_message_destroy on the message, and no that all
- * memory will be reclaimed with 'talloc_owner' is free. The caller
- * still can call notmuch_message_destroy when finished with the
- * message if desired.
- *
- * The 'talloc_owner' argument can also be NULL, in which case the
- * caller *is* responsible for calling notmuch_message_destroy.
+ * The 'notmuch' database will be the talloc owner of the returned
+ * message.
  *
  * If there is already a document with message ID 'message_id' in the
  * database, then the returned message can be used to query/modify the
@@ -167,8 +162,7 @@ _notmuch_message_create (const void *talloc_owner,
  * not be NULL.)
  */
 notmuch_message_t *
-_notmuch_message_create_for_message_id (const void *talloc_owner,
-                                       notmuch_database_t *notmuch,
+_notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
                                        const char *message_id,
                                        notmuch_private_status_t *status_ret)
 {
@@ -181,7 +175,7 @@ _notmuch_message_create_for_message_id (const void *talloc_owner,
 
     message = notmuch_database_find_message (notmuch, message_id);
     if (message)
-       return talloc_steal (talloc_owner, message);
+       return talloc_steal (notmuch, message);
 
     term = talloc_asprintf (NULL, "%s%s",
                            _find_prefix ("id"), message_id);
@@ -202,7 +196,7 @@ _notmuch_message_create_for_message_id (const void *talloc_owner,
        return NULL;
     }
 
-    message = _notmuch_message_create (talloc_owner, notmuch,
+    message = _notmuch_message_create (notmuch, notmuch,
                                       doc_id, status_ret);
 
     /* We want to inform the caller that we had to create a new
@@ -270,16 +264,57 @@ notmuch_message_get_header (notmuch_message_t *message, const char *header)
     return notmuch_message_file_get_header (message->message_file, header);
 }
 
-/* XXX: We probably want to store the In-Reply-To header in the
- * database (separate from the References message IDs) so that we can
- * fetch it out again without having to go load the message file. */
+/* Return the message ID from the In-Reply-To header of 'message'.
+ *
+ * Returns an empty string ("") if 'message' has no In-Reply-To
+ * header.
+ *
+ * Returns NULL if any error occurs.
+ */
 const char *
 _notmuch_message_get_in_reply_to (notmuch_message_t *message)
 {
-    return _parse_message_id (message,
-                             notmuch_message_get_header (message,
-                                                         "in-reply-to"),
-                             NULL);
+    const char *prefix = _find_prefix ("replyto");
+    int prefix_len = strlen (prefix);
+    Xapian::TermIterator i;
+    std::string in_reply_to;
+
+    if (message->in_reply_to)
+       return message->in_reply_to;
+
+    i = message->doc.termlist_begin ();
+    i.skip_to (prefix);
+
+    in_reply_to = *i;
+
+    /* It's perfectly valid for a message to have no In-Reply-To
+     * header. For these cases, we return an empty string. */
+    if (i == message->doc.termlist_end () ||
+       strncmp (in_reply_to.c_str (), prefix, prefix_len))
+    {
+       message->in_reply_to = talloc_strdup (message, "");
+       return message->in_reply_to;
+    }
+
+    message->in_reply_to = talloc_strdup (message,
+                                         in_reply_to.c_str () + prefix_len);
+
+#if DEBUG_DATABASE_SANITY
+    i++;
+
+    in_reply_to = *i;
+
+    if (i != message->doc.termlist_end () &&
+       strncmp ((*i).c_str (), prefix, prefix_len))
+    {
+       INTERNAL_ERROR ("Message %s has duplicate In-Reply-To IDs: %s and %s\n"
+                       notmuch_message_get_message_id (message),
+                       message->in_reply_to,
+                       (*i).c_str () + prefix_len);
+    }
+#endif
+
+    return message->in_reply_to;
 }
 
 const char *