inc/test-eom-align: Create test mboxes in less steps.

[nmh] / uip / distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 91eb0a8b2a60cfc9a36217a245a2cfc3af2ff138..bf469c3e8638cf2f846b843e9228b0f627f09ca9 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>
+#include "sbr/m_mktemp.h"
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;
@@ -29,7 +30,7 @@ distout (char *drft, char *msgnam, char *backup)
     char *dp, *resent;
     char name[NAMESZ], buffer[NMH_BUFSIZ];
     FILE *ifp, *ofp;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK)
        adios (backup, "unable to rename %s to",drft);
@@ -41,12 +42,13 @@ distout (char *drft, char *msgnam, char *backup)
     chmod (drft, m_gmprot ());
 
     ready_msg (msgnam);
-    lseek (hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */
+    lseek(hdrfd, 0, SEEK_SET); /* msgnam not accurate */
     cpydata (hdrfd, fileno (ofp), msgnam, drft);
 
+    gstate = m_getfld_state_init(ifp);
     for (resent = NULL;;) {
        int buffersz = sizeof buffer;
-       switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
+       switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) {
            case FLD: 
            case FLDPLUS: 
                if (uprf (name, "distribute-"))
@@ -63,7 +65,7 @@ distout (char *drft, char *msgnam, char *backup)
                fprintf (ofp, "%s: %s", name, buffer);
                while (state == FLDPLUS) {
                    buffersz = sizeof buffer;
-                   state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
+                   state = m_getfld2(&gstate, name, buffer, &buffersz);
                    resent = add (buffer, resent);
                    fputs (buffer, ofp);
                }
@@ -110,7 +112,7 @@ process: ;
     free (resent);
 
     if (txtfd != NOTOK) {
-       lseek (txtfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */
+       lseek(txtfd, 0, SEEK_SET); /* msgnam not accurate */
        cpydata (txtfd, fileno (ofp), msgnam, drft);
     }
 
@@ -127,7 +129,7 @@ ready_msg (char *msgnam)
     char name[NAMESZ], buffer[NMH_BUFSIZ], tmpfil[BUFSIZ];
     FILE *ifp, *ofp;
     char *cp = NULL;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if (hdrfd != NOTOK) {
         close (hdrfd);
@@ -151,9 +153,10 @@ ready_msg (char *msgnam)
        adios (NULL, "no file descriptors -- you lose big");
     (void) m_unlink (tmpfil);
 
+    gstate = m_getfld_state_init(ifp);
     for (;;) {
        int buffersz = sizeof buffer;
-       switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
+       switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) {
            case FLD: 
            case FLDPLUS: 
                if (uprf (name, "resent"))
@@ -161,7 +164,7 @@ ready_msg (char *msgnam)
                fprintf (ofp, "%s: %s", name, buffer);
                while (state == FLDPLUS) {
                    buffersz = sizeof buffer;
-                   state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
+                   state = m_getfld2(&gstate, name, buffer, &buffersz);
                    fputs (buffer, ofp);
                }
                break;
@@ -183,7 +186,7 @@ ready_msg (char *msgnam)
                fprintf (ofp, "\n%s", buffer);
                while (state == BODY) {
                    buffersz = sizeof buffer;
-                   state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
+                   state = m_getfld2(&gstate, name, buffer, &buffersz);
                    fputs (buffer, ofp);
                }
            case FILEEOF: