Re: [9front] [Bug] [PATCH] Mail cannot cope with multi-line header fields

[ori@eigenstate.org]

> Then the simplest way to do that might be something like the following (remove all line breaks from info fields, preserving it everywhere else).
> But maybe we would like to take into account the fact that some info fields never contain line breaks or remove them not just in info file but earlier by stripping them in copy822,..

I think I like your idea of doing it in copy822. How's this?

diff -r 9f6e77258f69 sys/src/cmd/upas/fs/mbox.c
--- a/sys/src/cmd/upas/fs/mbox.c	Thu Sep 10 16:26:42 2020 -0700
+++ b/sys/src/cmd/upas/fs/mbox.c	Sat Sep 12 15:57:45 2020 -0700
@@ -733,6 +733,19 @@
 }
 
 static char*
+unfold(char *s)
+{
+	char *p, *q;
+
+	q = s;
+	for(p = q; *p != '\0'; p++)
+		if(*p != '\r' && *p != '\n')
+			*q++ = *p;
+	*q = '\0';
+	return s;
+}
+
+static char*
 addr822(char *p, char **ac)
 {
 	int n, c, space, incomment, addrdone, inanticomment, quoted;
@@ -883,7 +896,7 @@
 static char*
 copy822(Message*, Header *h, char*, char *p)
 {
-	return rtrim(strdup(skipwhite(p + h->len)));
+	return rtrim(unfold(strdup(skipwhite(p + h->len))));
 }
 
 static char*