From a38fafed2bb19633b85a5159c12256cba1f35250 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Wed, 20 Jul 2016 13:51:23 +0200
Subject: mthread: rename from thread

---
 Makefile  |   4 +-
 mthread.c | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 thread.c  | 375 --------------------------------------------------------------
 3 files changed, 377 insertions(+), 377 deletions(-)
 create mode 100644 mthread.c
 delete mode 100644 thread.c

diff --git a/Makefile b/Makefile
index 37008e4..b654e32 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 CFLAGS=-g -O1 -Wall -Wno-switch -Wextra -fstack-protector-strong -D_FORTIFY_SOURCE=2
 
-ALL = mscan thread hdr show list mseq msort
+ALL = mscan mthread hdr show list mseq msort
 
 all: $(ALL)
 
 mscan: mscan.o blaze822.o seq.o rfc2047.o
-thread: thread.o blaze822.o seq.o
+mthread: mthread.o blaze822.o seq.o
 hdr: hdr.o blaze822.o seq.o rfc2047.o
 show: show.o blaze822.o seq.o rfc2045.o rfc2047.c
 list: list.o
diff --git a/mthread.c b/mthread.c
new file mode 100644
index 0000000..8aa0efd
--- /dev/null
+++ b/mthread.c
@@ -0,0 +1,375 @@
+/* jwz-style threading
+ * clean-room implementation of https://www.jwz.org/doc/threading.html
+ * without looking at any code
+ *
+ * subject threading and sibling sorting is not done yet
+ */
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <search.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "blaze822.h"
+
+struct container {
+	char *mid;
+	char *file;
+	struct message *msg;
+	time_t date;
+	struct container *parent;
+	struct container *child;
+	struct container *next;
+};
+
+static void *mids;
+
+int
+midorder(const void *a, const void *b)
+{
+	struct container *ia = (struct container *)a;
+	struct container *ib = (struct container *)b;
+
+	return strcmp(ia->mid, ib->mid);
+}
+
+char *
+mid(struct message *msg)
+{
+	char *v;
+	v = blaze822_hdr(msg, "message-id");
+	// XXX intern mid?
+	if (v) {
+		char *m;
+
+		m = strchr(v, '<');
+		if (!m)
+			return strdup(v);
+		v = strchr(m, '>');
+		if (!v)
+			return strdup(m);
+		return strndup(m+1, v-m-1);
+	} else {
+		// invent new message-id for internal tracking
+		static long i;
+		char buf[32];
+		snprintf(buf, sizeof buf, "thread%08ld@localhost", ++i);
+		return strdup(buf);
+	}
+}
+
+struct container *
+midcont(char *mid)
+{
+	struct container key, **result;
+	key.mid = mid;
+
+	if (!(result = tfind(&key, &mids, midorder))) {
+		struct container *c = malloc(sizeof (struct container));
+		c->mid = mid;
+		c->file = 0;
+		c->msg = 0;
+		c->date = -1;
+		c->parent = c->child = c->next = 0;
+		return *(struct container **)tsearch(c, &mids, midorder);
+	} else {
+		return *result;
+	}
+}
+
+struct container *
+store_id(char *file, struct message *msg)
+{
+	struct container *c;
+
+	c = midcont(mid(msg));
+	c->file = strdup(file);
+	c->msg = msg;
+
+	return c;
+}
+
+int
+reachable(struct container *child, struct container *parent)
+{
+	int r = 0;
+
+	if (strcmp(child->mid, parent->mid) == 0)
+		return 1;
+	if (child->child)
+		r |= reachable(child->child, parent);
+	if (child->next)
+		r |= reachable(child->next, parent);
+	return r;
+}
+
+void
+thread(char *file)
+{
+	struct message *msg;
+
+	msg = blaze822(file);
+	if (!msg)
+		return;
+
+	struct container *c = store_id(file, msg);
+
+	char *mid = "";
+
+	char *v, *m;
+	struct container *parent = 0, *me = 0;
+
+	if ((v = blaze822_hdr(msg, "date"))) {
+		c->date = blaze822_date(v);
+	} else {
+		c->date = -1;
+	}
+
+	v = blaze822_hdr(msg, "references");
+	if (v) {
+		parent = 0;
+		while (1) {
+			m = strchr(v, '<');
+			if (!m)
+				break;
+			v = strchr(m, '>');
+			if (!v)
+				break;
+			mid = strndup(m+1, v-m-1);
+			// XXX free?
+
+			me = midcont(mid);
+
+			if (me == c)
+				continue;
+
+			if (parent && !me->parent &&
+			    !reachable(me, parent) && !reachable(parent, me)) {
+				me->parent = parent;
+				me->next = parent->child;
+				parent->child = me;
+			}
+
+			parent = me;
+		}
+	}
+	
+	v = blaze822_hdr(msg, "in-reply-to");
+	char *irt;
+	if (v) {
+		m = strchr(v, '<');
+		if (!m)
+			goto out;
+		v = strchr(m, '>');
+		if (!v)
+			goto out;
+		irt = strndup(m+1, v-m-1);
+		
+		if (strcmp(irt, mid) != 0) {
+			parent = midcont(irt);
+		}
+	}
+out:
+
+	if (parent && parent != c) {
+		struct container *r;
+
+		if (c->parent == parent) { // already correct
+			goto out2;
+		} else if (c->parent) {
+			// if we already have a wrong parent, orphan us first
+
+			if (c->parent->child == c)   // first in list
+				c->parent->child = c->parent->child->next;
+			for (r = c->parent->child; r; r = r->next) {
+				if (r->next == c)
+					r->next = c->next;
+			}
+
+			c->next = 0;
+		}
+
+		c->parent = parent;
+
+		// add at the end
+		if (!parent->child) {
+			parent->child = c;
+		} else {
+			for (r = parent->child; r && r->next; r = r->next)
+				if (r == c)
+					goto out2;
+			r->next = c;
+			c->next = 0;
+		}
+
+out2:
+		// someone said our parent was our child, a lie
+		if (c->child == c->parent) {
+			c->child->parent = 0;
+			c->child = 0;
+		}
+	}
+}
+
+time_t
+newest(struct container *c, int depth)
+{
+	time_t n = -1;
+
+	if (!c)
+		return n;
+
+	do {
+		if (c->child) {
+			time_t r = newest(c->child, depth+1);
+			if (n < r)
+				n = r;
+		}
+		if (n < c->date)
+			n = c->date;
+	} while ((c = c->next));
+
+	return n;
+}
+
+struct container *top;
+struct container *lastc;
+
+void
+find_root(const void *nodep, const VISIT which, const int depth)
+{
+	(void)depth;
+
+	if (which == preorder || which == leaf) {
+		struct container *c = *(struct container **)nodep;
+
+		if (!c->parent) {
+			lastc->next = c;
+			c->next = 0;
+			time_t r = newest(c->child, 0);
+			if (c->date < r)
+				c->date = r;
+			lastc = c;
+		}
+	}
+}
+
+void
+find_roots()
+{
+	top = malloc (sizeof (struct container));
+	top->msg = 0;
+	top->date = -1;
+	top->file = 0;
+	top->next = top->child = top->parent = 0;
+	top->mid = "(top)";
+
+	lastc = top;
+
+	twalk(mids, find_root);
+
+	top->child = top->next;
+	top->next = 0;
+}
+
+void
+prune_tree(struct container *c, int depth)
+{
+	do {
+		if (c->child)
+			prune_tree(c->child, depth+1);
+		if (depth >= 0 && !c->file && c->child && !c->child->next) {
+			// turn into child if we don't exist and only have a child
+			c->mid = c->child->mid;
+			c->file = c->child->file;
+			c->msg = c->child->msg;
+			c->date = c->child->date;
+			c->child = c->child->child;
+		}
+	} while ((c = c->next));
+}
+
+static int
+dateorder(const void *a, const void *b)
+{
+	struct container *ia = *(struct container **)a;
+	struct container *ib = *(struct container **)b;
+
+	if (ia->date < ib->date)
+		return -1;
+	else if (ia->date > ib->date)
+		return 1;
+	return 0;
+}
+
+void
+sort_tree(struct container *c, int depth)
+{
+	if (c && c->child) {
+		struct container *r;
+		int i, j;
+		for (r = c->child, i = 0; r; r = r->next, i++)
+			sort_tree(r, depth+1);
+
+		if (i == 1) // no sort needed
+			return;
+
+		struct container **a = calloc(sizeof (struct container *), i);
+		if (!a)
+			return;
+
+		for (r = c->child, i = 0; r; r = r->next, i++)
+			a[i] = r;
+
+		qsort(a, i, sizeof (struct container *), dateorder);
+
+		c->child = a[0];
+		for (j = 0; j+1 < i; j++)
+			a[j]->next = a[j+1];
+		a[i-1]->next = 0;
+
+		free(a);
+	}
+}
+
+void
+print_tree(struct container *c, int depth)
+{
+	do {
+		if (depth >= 0) {
+			int i;
+			for (i = 0; i < depth; i++)
+				printf(" ");
+			if (c->file)
+				printf("%s\n", c->file);
+			else
+				printf("<%s>\n", c->mid);
+		}
+	
+		if (c->child)
+			print_tree(c->child, depth+1);
+	} while ((c = c->next));
+}
+
+int
+main(int argc, char *argv[])
+{
+	int i = blaze822_loop(argc-1, argv+1, thread);
+
+	find_roots();
+	prune_tree(top, -1);
+	sort_tree(top, -1);
+	print_tree(top, -1);
+
+	fprintf(stderr, "%d mails threaded\n", i);
+
+	return 0;
+}
diff --git a/thread.c b/thread.c
deleted file mode 100644
index 8aa0efd..0000000
--- a/thread.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/* jwz-style threading
- * clean-room implementation of https://www.jwz.org/doc/threading.html
- * without looking at any code
- *
- * subject threading and sibling sorting is not done yet
- */
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <search.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "blaze822.h"
-
-struct container {
-	char *mid;
-	char *file;
-	struct message *msg;
-	time_t date;
-	struct container *parent;
-	struct container *child;
-	struct container *next;
-};
-
-static void *mids;
-
-int
-midorder(const void *a, const void *b)
-{
-	struct container *ia = (struct container *)a;
-	struct container *ib = (struct container *)b;
-
-	return strcmp(ia->mid, ib->mid);
-}
-
-char *
-mid(struct message *msg)
-{
-	char *v;
-	v = blaze822_hdr(msg, "message-id");
-	// XXX intern mid?
-	if (v) {
-		char *m;
-
-		m = strchr(v, '<');
-		if (!m)
-			return strdup(v);
-		v = strchr(m, '>');
-		if (!v)
-			return strdup(m);
-		return strndup(m+1, v-m-1);
-	} else {
-		// invent new message-id for internal tracking
-		static long i;
-		char buf[32];
-		snprintf(buf, sizeof buf, "thread%08ld@localhost", ++i);
-		return strdup(buf);
-	}
-}
-
-struct container *
-midcont(char *mid)
-{
-	struct container key, **result;
-	key.mid = mid;
-
-	if (!(result = tfind(&key, &mids, midorder))) {
-		struct container *c = malloc(sizeof (struct container));
-		c->mid = mid;
-		c->file = 0;
-		c->msg = 0;
-		c->date = -1;
-		c->parent = c->child = c->next = 0;
-		return *(struct container **)tsearch(c, &mids, midorder);
-	} else {
-		return *result;
-	}
-}
-
-struct container *
-store_id(char *file, struct message *msg)
-{
-	struct container *c;
-
-	c = midcont(mid(msg));
-	c->file = strdup(file);
-	c->msg = msg;
-
-	return c;
-}
-
-int
-reachable(struct container *child, struct container *parent)
-{
-	int r = 0;
-
-	if (strcmp(child->mid, parent->mid) == 0)
-		return 1;
-	if (child->child)
-		r |= reachable(child->child, parent);
-	if (child->next)
-		r |= reachable(child->next, parent);
-	return r;
-}
-
-void
-thread(char *file)
-{
-	struct message *msg;
-
-	msg = blaze822(file);
-	if (!msg)
-		return;
-
-	struct container *c = store_id(file, msg);
-
-	char *mid = "";
-
-	char *v, *m;
-	struct container *parent = 0, *me = 0;
-
-	if ((v = blaze822_hdr(msg, "date"))) {
-		c->date = blaze822_date(v);
-	} else {
-		c->date = -1;
-	}
-
-	v = blaze822_hdr(msg, "references");
-	if (v) {
-		parent = 0;
-		while (1) {
-			m = strchr(v, '<');
-			if (!m)
-				break;
-			v = strchr(m, '>');
-			if (!v)
-				break;
-			mid = strndup(m+1, v-m-1);
-			// XXX free?
-
-			me = midcont(mid);
-
-			if (me == c)
-				continue;
-
-			if (parent && !me->parent &&
-			    !reachable(me, parent) && !reachable(parent, me)) {
-				me->parent = parent;
-				me->next = parent->child;
-				parent->child = me;
-			}
-
-			parent = me;
-		}
-	}
-	
-	v = blaze822_hdr(msg, "in-reply-to");
-	char *irt;
-	if (v) {
-		m = strchr(v, '<');
-		if (!m)
-			goto out;
-		v = strchr(m, '>');
-		if (!v)
-			goto out;
-		irt = strndup(m+1, v-m-1);
-		
-		if (strcmp(irt, mid) != 0) {
-			parent = midcont(irt);
-		}
-	}
-out:
-
-	if (parent && parent != c) {
-		struct container *r;
-
-		if (c->parent == parent) { // already correct
-			goto out2;
-		} else if (c->parent) {
-			// if we already have a wrong parent, orphan us first
-
-			if (c->parent->child == c)   // first in list
-				c->parent->child = c->parent->child->next;
-			for (r = c->parent->child; r; r = r->next) {
-				if (r->next == c)
-					r->next = c->next;
-			}
-
-			c->next = 0;
-		}
-
-		c->parent = parent;
-
-		// add at the end
-		if (!parent->child) {
-			parent->child = c;
-		} else {
-			for (r = parent->child; r && r->next; r = r->next)
-				if (r == c)
-					goto out2;
-			r->next = c;
-			c->next = 0;
-		}
-
-out2:
-		// someone said our parent was our child, a lie
-		if (c->child == c->parent) {
-			c->child->parent = 0;
-			c->child = 0;
-		}
-	}
-}
-
-time_t
-newest(struct container *c, int depth)
-{
-	time_t n = -1;
-
-	if (!c)
-		return n;
-
-	do {
-		if (c->child) {
-			time_t r = newest(c->child, depth+1);
-			if (n < r)
-				n = r;
-		}
-		if (n < c->date)
-			n = c->date;
-	} while ((c = c->next));
-
-	return n;
-}
-
-struct container *top;
-struct container *lastc;
-
-void
-find_root(const void *nodep, const VISIT which, const int depth)
-{
-	(void)depth;
-
-	if (which == preorder || which == leaf) {
-		struct container *c = *(struct container **)nodep;
-
-		if (!c->parent) {
-			lastc->next = c;
-			c->next = 0;
-			time_t r = newest(c->child, 0);
-			if (c->date < r)
-				c->date = r;
-			lastc = c;
-		}
-	}
-}
-
-void
-find_roots()
-{
-	top = malloc (sizeof (struct container));
-	top->msg = 0;
-	top->date = -1;
-	top->file = 0;
-	top->next = top->child = top->parent = 0;
-	top->mid = "(top)";
-
-	lastc = top;
-
-	twalk(mids, find_root);
-
-	top->child = top->next;
-	top->next = 0;
-}
-
-void
-prune_tree(struct container *c, int depth)
-{
-	do {
-		if (c->child)
-			prune_tree(c->child, depth+1);
-		if (depth >= 0 && !c->file && c->child && !c->child->next) {
-			// turn into child if we don't exist and only have a child
-			c->mid = c->child->mid;
-			c->file = c->child->file;
-			c->msg = c->child->msg;
-			c->date = c->child->date;
-			c->child = c->child->child;
-		}
-	} while ((c = c->next));
-}
-
-static int
-dateorder(const void *a, const void *b)
-{
-	struct container *ia = *(struct container **)a;
-	struct container *ib = *(struct container **)b;
-
-	if (ia->date < ib->date)
-		return -1;
-	else if (ia->date > ib->date)
-		return 1;
-	return 0;
-}
-
-void
-sort_tree(struct container *c, int depth)
-{
-	if (c && c->child) {
-		struct container *r;
-		int i, j;
-		for (r = c->child, i = 0; r; r = r->next, i++)
-			sort_tree(r, depth+1);
-
-		if (i == 1) // no sort needed
-			return;
-
-		struct container **a = calloc(sizeof (struct container *), i);
-		if (!a)
-			return;
-
-		for (r = c->child, i = 0; r; r = r->next, i++)
-			a[i] = r;
-
-		qsort(a, i, sizeof (struct container *), dateorder);
-
-		c->child = a[0];
-		for (j = 0; j+1 < i; j++)
-			a[j]->next = a[j+1];
-		a[i-1]->next = 0;
-
-		free(a);
-	}
-}
-
-void
-print_tree(struct container *c, int depth)
-{
-	do {
-		if (depth >= 0) {
-			int i;
-			for (i = 0; i < depth; i++)
-				printf(" ");
-			if (c->file)
-				printf("%s\n", c->file);
-			else
-				printf("<%s>\n", c->mid);
-		}
-	
-		if (c->child)
-			print_tree(c->child, depth+1);
-	} while ((c = c->next));
-}
-
-int
-main(int argc, char *argv[])
-{
-	int i = blaze822_loop(argc-1, argv+1, thread);
-
-	find_roots();
-	prune_tree(top, -1);
-	sort_tree(top, -1);
-	print_tree(top, -1);
-
-	fprintf(stderr, "%d mails threaded\n", i);
-
-	return 0;
-}
-- 
cgit 1.4.1