Mercurial > dovecot > original-hg > dovecot-1.2

changeset 77:51b449a2a56b HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix to previous mbox fix :)
author Timo Sirainen <tss@iki.fi>
date Wed, 28 Aug 2002 23:24:06 +0300
parents 8035cf09b913
children 0d8bfff71b80
files src/lib-index/mbox/mbox-open.c
diffstat 1 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mbox/mbox-open.c	Wed Aug 28 23:20:16 2002 +0300
+++ b/src/lib-index/mbox/mbox-open.c	Wed Aug 28 23:24:06 2002 +0300
@@ -65,9 +65,7 @@
 			/* and check that we end with either EOF or to
 			   beginning of next message */
 			ret = read(fd, buf, 7);
-			if (ret == 0)
-				failed = FALSE; /* end of file */
-			else if (ret >= 6) {
+			if (ret >= 6) {
 				/* "[\r]\nFrom " expected */
 				if (buf[0] != '\r')
 					p = buf;
@@ -77,6 +75,17 @@
 				}
 				if (ret >= 6 && strncmp(p, "\nFrom ", 6) == 0)
 					failed = FALSE;
+			} else {
+				p = buf;
+				if (ret > 0 && *p == '\r') {
+					p++;
+					ret--;
+				}
+				if (ret > 0 && *p == '\n')
+					ret--;
+
+				if (ret == 0)
+					failed = FALSE; /* end of file */
 			}
 		}
 	}