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

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 1b6a0ed..3d66bcf 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -2,8 +2,6 @@
 /*
  * scansbr.c -- routines to help scan along...
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -21,13 +19,6 @@
 # define _cnt _w                /* Wretch */
 #endif
 
-#ifdef SCO_5_STDIO
-# define _ptr  __ptr
-# define _cnt  __cnt
-# define _base __base
-# define _filbuf(fp)  ((fp)->__cnt = 0, __filbuf(fp))
-#endif
-
 #define MAXSCANL 256		/* longest possible scan line */
 
 /*
@@ -65,9 +56,13 @@ char *scanl = 0;			/* text of most recent scanline    */
 /*
  * prototypes
  */
-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,
@@ -76,19 +71,14 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
     int i, compnum, encrypted, state;
     unsigned char *cp, *tmpbuf;
     char **nxtbuf;
-    char *saved_c_text;
+    char *saved_c_text = NULL;
     struct comp *cptr;
     struct comp **savecomp;
-    char *scnmsg;
-    FILE *scnout;
+    char *scnmsg = NULL;
+    FILE *scnout = NULL;
     char name[NAMESZ];
     static int rlwidth, slwidth;
 
-#ifdef RPATHS
-    char returnpath[BUFSIZ];
-    char deliverydate[BUFSIZ];
-#endif
-
     /* first-time only initialization */
     if (!scanl) {
 	if (width == 0) {
@@ -98,7 +88,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());
 
@@ -170,19 +160,6 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	}
 	if ((scnout = fopen (scnmsg, "w")) == NULL)
 	    adios (scnmsg, "unable to write");
-#ifdef RPATHS
-	/*
-	 * Add the Return-Path and Delivery-Date
-	 * header fields to message.
-	 */
-	if (get_returnpath (returnpath, sizeof(returnpath),
-		deliverydate, sizeof(deliverydate))) {
-	    FPUTS ("Return-Path: ");
-	    FPUTS (returnpath);
-	    FPUTS ("Delivery-Date: ");
-	    FPUTS (deliverydate);
-	}
-#endif /* RPATHS */
     }
 
     /* scan - main loop */
@@ -230,6 +207,15 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
 	    case BODY: 
 		compnum = -1;
+		/*
+		 * A slight hack ... if we have less than rlwidth characters
+		 * in the buffer, call m_getfld again.
+		 */
+
+		if ((i = strlen(tmpbuf)) < rlwidth) {
+		    state = m_getfld (state, name, tmpbuf + i,
+		    		      rlwidth - i, inb);
+		}
 		if (! outnum) {
 		    state = FILEEOF; /* stop now if scan cmd */
 		    goto finished;
@@ -251,6 +237,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 +249,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;
@@ -369,19 +361,6 @@ finished:
 }
 
 
-/*
- * Cheat:  we are loaded with adrparse, which wants a routine called
- * OfficialName().  We call adrparse:getm() with the correct arguments
- * to prevent OfficialName() from being called.  Hence, the following
- * is to keep the loader happy.
- */
-char *
-OfficialName (char *name)
-{
-    return name;
-}
-
-
 static int
 mh_fputs(char *s, FILE *stream)
 {