mseq: extract code into seq.c

Makefile

@@ -10,7 +10,7 @@ hdr: blaze822.o hdr.o rfc2047.o
 show: blaze822.o show.o rfc2045.o rfc2047.c
 list: list.o
 unmime: blaze822.o unmime.o rfc2045.o rfc2047.o
-mseq: mseq.o
+mseq: mseq.o seq.o
 
 clean: FRC
 	-rm -f $(ALL) *.o

blaze822.h

@@ -38,3 +38,9 @@ int blaze822_check_mime(struct message *msg);
 int blaze822_mime_body(struct message *msg, char **cto, char **bodyo, size_t *bodyleno, char **bodychunko);
 int blaze822_multipart(struct message *msg, struct message **imsg);
 int blaze822_mime_parameter(char *s, char *name, char **starto, char **stopo);
+
+// seq.c
+
+char *blaze822_seq_open(char *file);
+int blaze822_seq_load(char *map);
+long blaze822_seq_find(char *ref);

mseq.c

@@ -10,28 +10,7 @@
 #include <limits.h>
 #include <errno.h>
 
-char *
-seq_open(char *file)
-{
-	int fd;
-	struct stat st;
-
-	// env $SEQ or something
-	if (!file)
-		file = "map";
-	fd = open(file, O_RDONLY);
-	if (!fd)
-		return 0;
-
-	fstat(fd, &st);
-	char *map = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-	close(fd);
-
-	if (map == MAP_FAILED)
-		return 0;
-
-	return map;
-}
+#include "blaze822.h"
 
 static const char *
 readlin(const char *p)
@@ -84,7 +63,7 @@ parse_relnum(char *a, long cur, long last, long *out)
 int
 main(int argc, char *argv[])
 {
-	char *map = seq_open(0);
+	char *map = blaze822_seq_open(0);
 	if (!map)
 		return 1;
 

seq.c

@@ -0,0 +1,101 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <limits.h>
+#include <errno.h>
+#include <search.h>
+
+#include "blaze822.h"
+#include "blaze822_priv.h"
+
+char *
+blaze822_seq_open(char *file)
+{
+	int fd;
+	struct stat st;
+
+	// env $SEQ or something
+	if (!file)
+		file = "map";
+	fd = open(file, O_RDONLY);
+	if (!fd)
+		return 0;
+
+	fstat(fd, &st);
+	char *map = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+	close(fd);
+
+	if (map == MAP_FAILED)
+		return 0;
+
+	return map;
+}
+
+static void *msgnums;
+
+struct msgnum {
+	char *file;
+	long pos;
+};
+
+int
+msgnumorder(const void *a, const void *b)
+{
+        struct msgnum *ia = (struct msgnum *)a;
+        struct msgnum *ib = (struct msgnum *)b;
+
+        return strcmp(ia->file, ib->file);
+}
+
+long
+blaze822_seq_find(char *file)
+{
+	struct msgnum key, **result;
+        key.file = file;
+
+        if (!(result = tfind(&key, &msgnums, msgnumorder)))
+		return 0;
+
+	return (*result)->pos;
+}
+
+int
+blaze822_seq_load(char *map)
+{
+	char *s, *t;
+	long line;
+
+	for (s = map, line = 0; s; s = t+1) {
+		t = strchr(s, '\n');
+		if (!t)
+			break;
+		line++;
+		while (*s && iswsp(*s))
+			s++;
+		char *e = t;
+		while (s < e && isfws(*(e-1)))
+			e--;
+//		printf("{%.*s}\n", e-s, s);
+		char *f = strndup(s, e-s);
+		if (!f)
+			return -1;
+
+		struct msgnum key, **result;
+		key.file = f;
+
+		if (!(result = tfind(&key, &msgnums, msgnumorder))) {
+			struct msgnum *c = malloc(sizeof (struct msgnum));
+			c->file = f;
+			c->pos = line;
+			tsearch(c, &msgnums, msgnumorder);
+		}
+	}
+
+	return 0;
+}