Fixed "mark -sequence cur -delete all" to work for cur as

[mmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index c5f0329..3d66bcf 100644 (file)
--- 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,7 +56,6 @@ 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
@@ -89,11 +79,6 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
     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) {
@@ -175,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 */
@@ -235,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;
@@ -380,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)
 {