head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.4 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.2 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q2:1.2.0.34 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.32 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.30 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.28 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.26 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.24 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.22 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.20 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.18 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.16 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.14 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.12 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.10 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.8 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.6 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.4 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.2 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.1.0.22 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.20 pkgsrc-2008Q1:1.1.0.18 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.16 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.14 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.12 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2012.07.27.19.29.00; author drochner; state dead; branches; next 1.2; 1.2 date 2008.08.08.23.48.01; author epg; state Exp; branches; next 1.1; 1.1 date 2006.03.02.21.28.23; author joerg; state Exp; branches; next ; desc @@ 1.3 log @update to 1.5 changes: -a "From:" header is now required for outgoing mail, custom component files may need to be adjusted -support for filters in mhl -more fixes and new features, see the share/doc/nmh/NEWS file for details -dragonfly support patches were integrated @ text @$NetBSD: patch-af,v 1.2 2008/08/08 23:48:01 epg Exp $ Committed upstream in r1.14; should be in next release. --- sbr/m_getfld.c.orig 2006-03-02 20:29:22.000000000 +0000 +++ sbr/m_getfld.c @@@@ -261,6 +261,9 @@@@ m_getfld (int state, unsigned char *name 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; @@@@ -273,6 +276,8 @@@@ m_getfld (int state, unsigned char *name #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 @@@@ -286,6 +291,9 @@@@ m_getfld (int state, unsigned char *name } 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; @@@@ -330,6 +338,9 @@@@ m_getfld (int state, unsigned char *name #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; @@@@ -344,6 +355,11 @@@@ m_getfld (int state, unsigned char *name 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); @@@@ -363,6 +379,9 @@@@ m_getfld (int state, unsigned char *name #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); @@@@ -373,6 +392,9 @@@@ m_getfld (int state, unsigned char *name /* 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; @@@@ -392,6 +414,9 @@@@ m_getfld (int state, unsigned char *name 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); @@@@ -401,6 +426,9 @@@@ m_getfld (int state, unsigned char *name 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; @@@@ -424,6 +452,9 @@@@ m_getfld (int state, unsigned char *name #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; @@@@ -486,6 +517,9 @@@@ m_getfld (int state, unsigned char *name 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; @ 1.2 log @Note that these changes are upstream, will be in the next release. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1 2006/03/02 21:28:23 joerg Exp $ @ 1.1 log @Add DragonFly support. Fix errno. @ text @d1 3 a3 1 $NetBSD$ @