date.c: Add hard-coded definition of HAVE_TIMEZONE

[notmuch] / notmuch-index-message.cc

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 7610aa41f97c455ef0cf650ad3a52ac03886f2d8..e3de80f1ec63e9d7877e11485425f3d368ccfc83 100644 (file)
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -128,7 +128,40 @@ find_prefix (const char *name)
     return "";
 }
 
-int TERM_COMBINED = 0;
+/* "128 bits of thread-id ought to be enough for anybody" */
+#define NOTMUCH_THREAD_ID_BITS  128
+#define NOTMUCH_THREAD_ID_DIGITS (NOTMUCH_THREAD_ID_BITS / 4)
+typedef struct _thread_id {
+    char str[NOTMUCH_THREAD_ID_DIGITS + 1];
+} thread_id_t;
+
+static void
+thread_id_generate (thread_id_t *thread_id)
+{
+    FILE *urandom;
+    uint32_t value;
+    char *s;
+    int i;
+
+    urandom = fopen ("/dev/urandom", "r");
+    if (urandom == NULL) {
+       fprintf (stderr, "Error opening /dev/urandom: %s\n",
+                strerror (errno));
+       fprintf (stderr, "Perhaps notmuch needs some portability fixes for your platform?\n");
+       exit (1);
+    }
+
+    s = thread_id->str;
+    for (i = 0; i < NOTMUCH_THREAD_ID_DIGITS; i += 8) {
+       fread ((void *) &value, sizeof (value), 1, urandom);
+       sprintf (s, "%08x", value);
+       s += 8;
+    }
+
+    fclose (urandom);
+
+    printf ("Generated thread id: %s\n", thread_id->str);
+}
 
 static void
 add_term (Xapian::Document doc,
@@ -378,7 +411,8 @@ find_thread_ids (Xapian::Database db,
     const char *parent_message_id;
     GPtrArray *result;
 
-    thread_ids = g_hash_table_new (g_str_hash, g_str_equal);
+    thread_ids = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                       free, NULL);
 
     find_messages_by_term (db, "ref", message_id, &child, &children_end);
     for ( ; child != children_end; child++) {
@@ -399,6 +433,13 @@ find_thread_ids (Xapian::Database db,
        char *id = (char *) l->data;
        g_ptr_array_add (result, id);
     }
+    g_list_free (keys);
+
+    /* We're done with the hash table, but we've taken the pointers to
+     * the allocated strings and put them into our result array, so
+     * tell the hash not to free them on its way out. */
+    g_hash_table_steal_all (thread_ids);
+    g_hash_table_unref (thread_ids);
 
     return result;
 }
@@ -453,6 +494,10 @@ gen_terms_body_str (Xapian::TermGenerator term_gen,
        while (*next_line == '\n')
            next_line++;
 
+       /* Skip blank lines. */
+       if (line_end < line)
+           continue;
+
        /* Skip lines that are quotes. */
        if (*line == '>')
            continue;
@@ -690,9 +735,13 @@ index_file (Xapian::WritableDatabase db,
 
        g_string_free (thread_id, TRUE);
     } else if (message_id) {
-       /* If not referenced thread, use the message ID */
-       add_term (doc, "thread", message_id);
-       doc.add_value (NOTMUCH_VALUE_THREAD, message_id);
+       /* If not part of any existing thread, generate a new thread_id. */
+       thread_id_t thread_id;
+
+       thread_id_generate (&thread_id);
+
+       add_term (doc, "thread", thread_id.str);
+       doc.add_value (NOTMUCH_VALUE_THREAD, thread_id.str);
     }
 
     doc.add_value (NOTMUCH_VALUE_DATE, Xapian::sortable_serialise (time));
@@ -776,6 +825,8 @@ main (int argc, char **argv)
            }
        }
 
+       g_io_channel_unref (channel);
+
        gettimeofday (&tv_now, NULL);
        elapsed = (tv_now.tv_sec - tv_start.tv_sec +
                   (tv_now.tv_usec - tv_start.tv_usec) / 1e6);