X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld.c;h=bbf11fed6dc877abc72650d5f1bebfd49cac8c2f;hp=6c15886900d723e1a69f26b382877303f99855c6;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hpb=da831514de01e2407cef37c118ffff0526a486d0

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 6c15886..bbf11fe 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -266,6 +266,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 		bp = sp = (unsigned char *) iob->_IO_read_ptr - 1;
 		j = (cnt = ((long) iob->_IO_read_end -
 			(long) iob->_IO_read_ptr)  + 1) < i ? cnt : i;
+#elif defined(__DragonFly__)
+		bp = sp = (unsigned char *) ((struct __FILE_public *)iob)->_p - 1;
+		j = (cnt = ((struct __FILE_public *)iob)->_r+1) < i ? cnt : i;
 #else
 		bp = sp = (unsigned char *) iob->_ptr - 1;
 		j = (cnt = iob->_cnt+1) < i ? cnt : i;
@@ -278,6 +281,8 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 #ifdef LINUX_STDIO
 		    iob->_IO_read_ptr = iob->_IO_read_end;
 		    if (__underflow(iob) == EOF) {
+#elif defined(__DragonFly__)
+		    if (__srget(iob) == EOF) {
 #else
 		    if (_filbuf(iob) == EOF) {
 #endif
@@ -291,6 +296,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 		} else {
 #ifdef LINUX_STDIO
 		    iob->_IO_read_ptr = bp + 1;
+#elif defined(__DragonFly__)
+		    ((struct __FILE_public *)iob)->_p = bp + 1;
+		    ((struct __FILE_public *)iob)->_r = cnt - 1;
 #else
 		    iob->_ptr = bp + 1;
 		    iob->_cnt = cnt - 1;
@@ -306,10 +314,35 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 		 *  . hit the end of the buffer. (loop)
 		 */
 		if (c == '\n') {
-		    *cp = *buf = 0;
-		    advise (NULL, "eol encountered in field \"%s\"", name);
-		    state = FMTERR;
-		    goto finish;
+		    /* We hit the end of the line without seeing ':' to
+		     * terminate the field name.  This is usually (always?)
+		     * spam.  But, blowing up is lame, especially when
+		     * scan(1)ing a folder with such messages.  Pretend such
+		     * lines are the first of the body (at least mutt also
+		     * handles it this way). */
+
+		    /* See if buf can hold this line, since we were assuming
+		     * we had a buffer of NAMESZ, not bufsz. */
+		    /* + 1 for the newline */
+		    if (bufsz < j + 1) {
+			/* No, it can't.  Oh well, guess we'll blow up. */
+			*cp = *buf = 0;
+			advise (NULL, "eol encountered in field \"%s\"", name);
+			state = FMTERR;
+			goto finish;
+		    }
+		    memcpy (buf, name, j - 1);
+		    buf[j - 1] = '\n';
+		    buf[j] = '\0';
+		    /* mhparse.c:get_content wants to find the position of the
+		     * body start, but it thinks there's a blank line between
+		     * the header and the body (naturally!), so seek back so
+		     * that things line up even though we don't have that
+		     * blank line in this case.  Simpler parsers (e.g. mhl)
+		     * get extra newlines, but that should be harmless enough,
+		     * right?  This is a corrupt message anyway. */
+		    fseek (iob, ftell (iob) - 2, SEEK_SET);
+		    return BODY;
 		}
 		if ((i -= j) <= 0) {
 		    *cp = *buf = 0;
@@ -335,6 +368,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 #ifdef LINUX_STDIO
 		cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
 		bp = (unsigned char *) --iob->_IO_read_ptr;
+#elif defined(__DragonFly__)
+		cnt = ((struct __FILE_public *)iob)->_r++;
+		bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
 #else
 		cnt = iob->_cnt++;
 		bp = (unsigned char *) --iob->_ptr;
@@ -349,6 +385,11 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 			j = ep - (unsigned char *) iob->_IO_read_ptr;
 			memcpy (cp, iob->_IO_read_ptr, j);
 			iob->_IO_read_ptr = ep;
+#elif defined(__DragonFly__)
+			j = ep - (unsigned char *) ((struct __FILE_public *)iob)->_p;
+			memcpy (cp, ((struct __FILE_public *)iob)->_p, j);
+			((struct __FILE_public *)iob)->_p = ep;
+			((struct __FILE_public *)iob)->_r -= j;
 #else
 			j = ep - (unsigned char *) iob->_ptr;
 			memcpy (cp, iob->_ptr, j);
@@ -368,6 +409,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 #ifdef LINUX_STDIO
 		c += bp - (unsigned char *) iob->_IO_read_ptr;
 		memcpy( cp, iob->_IO_read_ptr, c);
+#elif defined(__DragonFly__)
+		c += bp - (unsigned char *) ((struct __FILE_public *)iob)->_p;
+		memcpy( cp, ((struct __FILE_public *)iob)->_p, c);
 #else
 		c += bp - (unsigned char *) iob->_ptr;
 		memcpy( cp, iob->_ptr, c);
@@ -378,6 +422,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 		    /* the dest buffer is full */
 #ifdef LINUX_STDIO
 		    iob->_IO_read_ptr += c;
+#elif defined(__DragonFly__)
+		    ((struct __FILE_public *)iob)->_r -= c;
+		    ((struct __FILE_public *)iob)->_p += c;
 #else
 		    iob->_cnt -= c;
 		    iob->_ptr += c;
@@ -397,6 +444,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 		iob->_IO_read_ptr = iob->_IO_read_end;
 		c = __underflow(iob);
 		iob->_IO_read_ptr++;    /* NOT automatic! */
+#elif defined(__DragonFly__)
+		*cp++ =j = *(((struct __FILE_public *)iob)->_p + c);
+		c = __srget(iob);
 #else
 		*cp++ = j = *(iob->_ptr + c);
 		c = _filbuf(iob);
@@ -406,6 +456,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 		    if (c != EOF) {
 #ifdef LINUX_STDIO
 			--iob->_IO_read_ptr;
+#elif defined(__DragonFly__)
+			--((struct __FILE_public *)iob)->_p;
+			++((struct __FILE_public *)iob)->_r;
 #else
 			--iob->_ptr;
 			++iob->_cnt;
@@ -429,6 +482,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 #ifdef LINUX_STDIO
 	    bp = (unsigned char *) --iob->_IO_read_ptr;
 	    cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
+#elif defined(__DragonFly__)
+	    bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
+	    cnt = ++((struct __FILE_public *)iob)->_r;
 #else
 	    bp = (unsigned char *) --iob->_ptr;
 	    cnt = ++iob->_cnt;
@@ -491,6 +547,9 @@ m_getfld (int state, unsigned char *name, unsigned char *buf,
 	    memcpy( buf, bp, c );
 #ifdef LINUX_STDIO
 	    iob->_IO_read_ptr += c;
+#elif defined(__DragonFly__)
+	    ((struct __FILE_public *)iob)->_r -= c;
+	    ((struct __FILE_public *)iob)->_p += c;
 #else
 	    iob->_cnt -= c;
 	    iob->_ptr += c;
@@ -700,10 +759,10 @@ get_returnpath (char *rp, int rplen, char *dd, int ddlen)
     if (cp) {
 	/* return path for UUCP style addressing */
 	dp = strchr (++cp, '\n');
-	snprintf (rp, rplen, "%.*s!%.*s\n", dp - cp, cp, bp - ap, ap);
+	snprintf (rp, rplen, "%.*s!%.*s\n", (int)(dp - cp), cp, (int)(bp - ap), ap);
     } else {
 	/* return path for standard domain addressing */
-	snprintf (rp, rplen, "%.*s\n", bp - ap, ap);
+	snprintf (rp, rplen, "%.*s\n", (int)(bp - ap), ap);
     }
 
     /*