X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=df18258431101c3032e2ae23f9844a89208e3278;hp=1b6a0ed9ec9ffdfe34929eb4bb09216c3bb2abc8;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=13f84dd50ca5754391dbd3296a5c7425f9363600

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 1b6a0ed..df18258 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -68,6 +68,11 @@ char *scanl = 0;			/* text of most recent scanline    */
 int sc_width (void);			/* from termsbr.c */
 static int mh_fputs(char *, FILE *);
 
+#ifdef MULTIBYTE_SUPPORT
+#define SCAN_CHARWIDTH MB_CUR_MAX
+#else
+#define SCAN_CHARWIDTH 1
+#endif
 
 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
@@ -98,7 +103,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		width = MAXSCANL;
 	}
 	dat[3] = slwidth = width;
-	scanl = (char *) mh_xmalloc((size_t) MB_CUR_MAX * (slwidth + 2) );
+	scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * (slwidth + 2) );
 	if (outnum)
 	    umask(~m_gmprot());
 
@@ -251,6 +256,8 @@ body:;
 		while (state == BODY) {
 #ifdef LINUX_STDIO
 		    if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
+#elif defined(__DragonFly__)
+		    if (((struct __FILE_public *)scnout)->_w <= 0) {
 #else
 		    if (scnout->_cnt <= 0) {
 #endif
@@ -261,6 +268,10 @@ body:;
 		    state = m_getfld(state, name, scnout->_IO_write_ptr,
 			(long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
 		    scnout->_IO_write_ptr += msg_count;
+#elif defined(__DragonFly__)
+		    state = m_getfld( state, name, ((struct __FILE_public *)scnout)->_p, -(((struct __FILE_public *)scnout)->_w), inb );
+		    ((struct __FILE_public *)scnout)->_w -= msg_count;
+		    ((struct __FILE_public *)scnout)->_p += msg_count;
 #else
 		    state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb );
 		    scnout->_cnt -= msg_count;