X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4a78cbcd4fa986d9c1e7bd0a5a4bdb619faeb7cb..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index d371ec1d..bf469c3e 100644
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * distsbr.c -- routines to do additional "dist-style" processing
+/* distsbr.c -- routines to do additional "dist-style" processing
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,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,9 +28,9 @@ distout (char *drft, char *msgnam, char *backup)
 {
     int state;
     char *dp, *resent;
-    char name[NAMESZ], buffer[BUFSIZ];
-    register FILE *ifp, *ofp;
-    m_getfld_state_t gstate = 0;
+    char name[NAMESZ], buffer[NMH_BUFSIZ];
+    FILE *ifp, *ofp;
+    m_getfld_state_t gstate;
 
     if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK)
 	adios (backup, "unable to rename %s to",drft);
@@ -43,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-"))
@@ -56,7 +56,7 @@ distout (char *drft, char *msgnam, char *backup)
 		if (uprf (name, "distribution-"))
 		    snprintf (name, sizeof(name), "%s%s", "Resent", &name[12]);
 		if (!uprf (name, "resent")) {
-		    advise (NULL, BADHDR, "draft", name);
+		    inform(BADHDR, "draft", name);
 		    goto leave_bad;
 		}
 		if (state == FLD)
@@ -65,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);
 		}
@@ -74,7 +74,7 @@ distout (char *drft, char *msgnam, char *backup)
 	    case BODY: 
 		for (dp = buffer; *dp; dp++)
 		    if (!isspace ((unsigned char) *dp)) {
-			advise (NULL, BADTXT, "draft");
+			inform(BADTXT, "draft");
 			goto leave_bad;
 		    }
 
@@ -83,11 +83,11 @@ distout (char *drft, char *msgnam, char *backup)
 
 	    case LENERR: 
 	    case FMTERR: 
-		advise (NULL, BADRFT, "draft");
+		inform(BADRFT, "draft");
 	leave_bad: ;
 		fclose (ifp);
 		fclose (ofp);
-		unlink (drft);
+		(void) m_unlink (drft);
 		if (rename (backup, drft) == NOTOK)
 		    adios (drft, "unable to rename %s to", backup);
 		return NOTOK;
@@ -102,9 +102,9 @@ process: ;
     fflush (ofp);
 
     if (!resent) {
-	advise (NULL, BADMSG, "draft");
+	inform(BADMSG, "draft");
 	fclose (ofp);
-	unlink (drft);
+	(void) m_unlink (drft);
 	if (rename (backup, drft) == NOTOK)
 	    adios (drft, "unable to rename %s to", backup);
 	return NOTOK;
@@ -112,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);
     }
 
@@ -126,15 +126,19 @@ static void
 ready_msg (char *msgnam)
 {
     int state, out;
-    char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
-    register FILE *ifp, *ofp;
+    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), hdrfd = NOTOK;
-    if (txtfd != NOTOK)
-	close (txtfd), txtfd = NOTOK;
+    if (hdrfd != NOTOK) {
+        close (hdrfd);
+        hdrfd = NOTOK;
+    }
+    if (txtfd != NOTOK) {
+        close (txtfd);
+        txtfd = NOTOK;
+    }
 
     if ((ifp = fopen (msgnam, "r")) == NULL)
 	adios (msgnam, "unable to open message");
@@ -147,11 +151,12 @@ ready_msg (char *msgnam)
     if ((out = dup (hdrfd)) == NOTOK
 	    || (ofp = fdopen (out, "w")) == NULL)
 	adios (NULL, "no file descriptors -- you lose big");
-    unlink (tmpfil);
+    (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"))
@@ -159,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;
@@ -177,11 +182,11 @@ ready_msg (char *msgnam)
 		if ((out = dup (txtfd)) == NOTOK
 			|| (ofp = fdopen (out, "w")) == NULL)
 		    adios (NULL, "no file descriptors -- you lose big");
-		unlink (tmpfil);
+		(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: