upas: appendfolder(): skip the address from unix header before date

[plan9front.git] / sys / src / cmd / upas / common / folder.c

diff --git a/sys/src/cmd/upas/common/folder.c b/sys/src/cmd/upas/common/folder.c
index 98120850d563cfa92a49c890b532ed30d6bf397b..5aeddc544389cc5e3fc4da754adb48df8ce1a204 100644 (file)
--- a/sys/src/cmd/upas/common/folder.c
+++ b/sys/src/cmd/upas/common/folder.c
@@ -186,8 +186,8 @@ mboxesc(Biobuf *in, Biobuf *out, int type)
 int
 appendfolder(Biobuf *b, char *addr, int fd)
 {
-       char *s;
-       int r, n;
+       char *s, *t;
+       int r;
        Biobuf bin;
        Folder *f;
        Tm tm;
@@ -196,10 +196,11 @@ appendfolder(Biobuf *b, char *addr, int fd)
        Bseek(f->out, 0, 2);
        Binit(&bin, fd, OREAD);
        s = Brdstr(&bin, '\n', 0);
-       n = strlen(s);
-       if(!s || strncmp(s, "From ", 5) != 0)
+       if(s == nil || strncmp(s, "From ", 5) != 0)
                Bprint(f->out, "From %s %.28s\n", addr, ctime(f->t));
-       else if(n > 5 && tmparse(&tm, Ctimefmt, s + 5, nil, nil) != nil)
+       else if(strncmp(s, "From ", 5) == 0 
+               && (t = strchr(s + 5, ' ')) != nil
+               && tmparse(&tm, Ctimefmt, t + 1, nil, nil) != nil)
                f->t = tm2sec(&tm);
        if(s)
                Bwrite(f->out, s, strlen(s));