X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3d4623ef62a6ee5b91e3b20e5ed4c938ebba2b05..ec173fd2c:/uip/distsbr.c?ds=sidebyside

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 91eb0a8b..4df836ef 100644
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -5,9 +5,17 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "distsbr.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/m_getfld.h"
+#include "sbr/cpydata.h"
+#include "sbr/uprf.h"
+#include "sbr/m_backup.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/utils.h>
+#include "h/utils.h"
+#include "sbr/m_mktemp.h"
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;
@@ -29,7 +37,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,18 +49,21 @@ 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-"))
-		    snprintf (name, sizeof(name), "%s%s", "Resent", &name[10]);
+		    snprintf (name, sizeof(name), "%s%.*s", "Resent",
+			      (int) sizeof name - 7, &name[10]);
 		if (uprf (name, "distribution-"))
-		    snprintf (name, sizeof(name), "%s%s", "Resent", &name[12]);
+		    snprintf (name, sizeof(name), "%s%.*s", "Resent",
+			      (int) sizeof name - 7, &name[12]);
 		if (!uprf (name, "resent")) {
 		    inform(BADHDR, "draft", name);
 		    goto leave_bad;
@@ -63,7 +74,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);
 		}
@@ -91,7 +102,7 @@ distout (char *drft, char *msgnam, char *backup)
 		return NOTOK;
 
 	    default: 
-		adios (NULL, "getfld() returned %d", state);
+		die("getfld() returned %d", state);
 	}
     }
 process: ;
@@ -110,7 +121,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 +138,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);
@@ -143,17 +154,18 @@ ready_msg (char *msgnam)
 
     cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
     if (cp == NULL) {
-	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+	die("unable to create temporary file in %s", get_temp_dir());
     }
     strncpy(tmpfil, cp, sizeof(tmpfil));
     if ((out = dup (hdrfd)) == NOTOK
 	    || (ofp = fdopen (out, "w")) == NULL)
-	adios (NULL, "no file descriptors -- you lose big");
+	die("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 +173,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;
@@ -171,19 +183,19 @@ ready_msg (char *msgnam)
 
                 cp = m_mktemp2(NULL, "dist", &txtfd, NULL);
                 if (cp == NULL) {
-		    adios(NULL, "unable to create temporary file in %s",
+		    die("unable to create temporary file in %s",
 			  get_temp_dir());
                 }
                 fchmod(txtfd, 0600);
 		strncpy (tmpfil, cp, sizeof(tmpfil));
 		if ((out = dup (txtfd)) == NOTOK
 			|| (ofp = fdopen (out, "w")) == NULL)
-		    adios (NULL, "no file descriptors -- you lose big");
+		    die("no file descriptors -- you lose big");
 		(void) m_unlink (tmpfil);
 		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: 
@@ -191,10 +203,10 @@ ready_msg (char *msgnam)
 
 	    case LENERR: 
 	    case FMTERR: 
-		adios (NULL, "format error in message %s", msgnam);
+		die("format error in message %s", msgnam);
 
 	    default: 
-		adios (NULL, "getfld() returned %d", state);
+		die("getfld() returned %d", state);
 	}
     }
 process: ;