X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fmessage.cc;h=e0b8a8e111925342e82d38d26ff8064b551915f0;hb=d746688bebf76e2ba276ae965c9372670607c68f;hp=692fd897813873892f832485c003fd83e661fd4f;hpb=387828c4356416278fdac8446c904fe4c5ad283d;p=notmuch

diff --git a/lib/message.cc b/lib/message.cc
index 692fd897..e0b8a8e1 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -146,17 +146,10 @@ _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).
+ * (which may or may not already exist in the database).
  *
- * 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
@@ -169,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)
 {
@@ -183,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);
@@ -204,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
@@ -293,7 +285,8 @@ _notmuch_message_get_in_reply_to (notmuch_message_t *message)
     i = message->doc.termlist_begin ();
     i.skip_to (prefix);
 
-    in_reply_to = *i;
+    if (i != message->doc.termlist_end ())
+	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. */
@@ -328,31 +321,39 @@ _notmuch_message_get_in_reply_to (notmuch_message_t *message)
 const char *
 notmuch_message_get_thread_id (notmuch_message_t *message)
 {
+    const char *prefix = _find_prefix ("thread");
     Xapian::TermIterator i;
+    std::string id;
+
+    /* This code is written with the assumption that "thread" has a
+     * single-character prefix. */
+    assert (strlen (prefix) == 1);
 
     if (message->thread_id)
 	return message->thread_id;
 
     i = message->doc.termlist_begin ();
-    i.skip_to (_find_prefix ("thread"));
+    i.skip_to (prefix);
 
-    if (i == message->doc.termlist_end ())
+    if (i != message->doc.termlist_end ())
+	id = *i;
+
+    if (i == message->doc.termlist_end () || id[0] != *prefix)
 	INTERNAL_ERROR ("Message with document ID of %d has no thread ID.\n",
 			message->doc_id);
 
-    message->thread_id = talloc_strdup (message, (*i).c_str () + 1);
+    message->thread_id = talloc_strdup (message, id.c_str () + 1);
 
 #if DEBUG_DATABASE_SANITY
     i++;
+    id = *i;
 
-    if (i != message->doc.termlist_end () &&
-	strncmp ((*i).c_str (), _find_prefix ("thread"),
-		 strlen (_find_prefix ("thread"))) == 0)
+    if (i != message->doc.termlist_end () && id[0] == *prefix)
     {
 	INTERNAL_ERROR ("Message %s has duplicate thread IDs: %s and %s\n",
 			notmuch_message_get_message_id (message),
 			message->thread_id,
-			(*i).c_str () + 1);
+			id.c_str () + 1);
     }
 #endif
 
@@ -466,7 +467,7 @@ notmuch_message_get_tags (notmuch_message_t *message)
 
     i.skip_to (prefix);
 
-    while (1) {
+    while (i != end) {
 	tag = *i;
 
 	if (tag.empty () || tag[0] != *prefix)
@@ -490,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);
@@ -547,6 +548,19 @@ _notmuch_message_sync (notmuch_message_t *message)
     db->replace_document (message->doc_id, message->doc);
 }
 
+/* Ensure that 'message' is not holding any file object open. Future
+ * calls to various functions will still automatically open the
+ * message file as needed.
+ */
+void
+_notmuch_message_close (notmuch_message_t *message)
+{
+    if (message->message_file) {
+	notmuch_message_file_close (message->message_file);
+	message->message_file = NULL;
+    }
+}
+
 /* Add a name:value term to 'message', (the actual term will be
  * encoded by prefixing the value with a short prefix). See
  * NORMAL_PREFIX and BOOLEAN_PREFIX arrays for the mapping of term