X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/869b0d5dc814215b72b1899cf82073d13bb65a97..665dfc96:/uip/distsbr.c?ds=sidebyside

diff --git a/uip/distsbr.c b/uip/distsbr.c
index bbaeaf51..91eb0a8b 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
@@ -28,10 +26,10 @@ int
 distout (char *drft, char *msgnam, char *backup)
 {
     int state;
-    register unsigned char *dp;
-    register char *resent;
-    char name[NAMESZ], buffer[BUFSIZ];
-    register FILE *ifp, *ofp;
+    char *dp, *resent;
+    char name[NAMESZ], buffer[NMH_BUFSIZ];
+    FILE *ifp, *ofp;
+    m_getfld_state_t gstate = 0;
 
     if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK)
 	adios (backup, "unable to rename %s to",drft);
@@ -46,18 +44,17 @@ distout (char *drft, char *msgnam, char *backup)
     lseek (hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */
     cpydata (hdrfd, fileno (ofp), msgnam, drft);
 
-    for (state = FLD, resent = NULL;;) {
+    for (resent = NULL;;) {
 	int buffersz = sizeof buffer;
-	switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
+	switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
 	    case FLD: 
 	    case FLDPLUS: 
-	    case FLDEOF: 
 		if (uprf (name, "distribute-"))
 		    snprintf (name, sizeof(name), "%s%s", "Resent", &name[10]);
 		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)
@@ -66,19 +63,16 @@ distout (char *drft, char *msgnam, char *backup)
 		fprintf (ofp, "%s: %s", name, buffer);
 		while (state == FLDPLUS) {
 		    buffersz = sizeof buffer;
-		    state = m_getfld (state, name, buffer, &buffersz, ifp);
+		    state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
 		    resent = add (buffer, resent);
 		    fputs (buffer, ofp);
 		}
-		if (state == FLDEOF)
-		    goto process;
 		break;
 
 	    case BODY: 
-	    case BODYEOF: 
 		for (dp = buffer; *dp; dp++)
-		    if (!isspace (*dp)) {
-			advise (NULL, BADTXT, "draft");
+		    if (!isspace ((unsigned char) *dp)) {
+			inform(BADTXT, "draft");
 			goto leave_bad;
 		    }
 
@@ -87,11 +81,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;
@@ -101,13 +95,14 @@ distout (char *drft, char *msgnam, char *backup)
 	}
     }
 process: ;
+    m_getfld_state_destroy (&gstate);
     fclose (ifp);
     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;
@@ -129,65 +124,66 @@ 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;
 
-    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");
 
     cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
     if (cp == NULL) {
-        adios("distsbr", "unable to create temporary file");
+	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
     }
-    fchmod(hdrfd, 0600);
     strncpy(tmpfil, cp, sizeof(tmpfil));
     if ((out = dup (hdrfd)) == NOTOK
 	    || (ofp = fdopen (out, "w")) == NULL)
 	adios (NULL, "no file descriptors -- you lose big");
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
 
-    for (state = FLD;;) {
+    for (;;) {
 	int buffersz = sizeof buffer;
-	switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
+	switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
 	    case FLD: 
 	    case FLDPLUS: 
-	    case FLDEOF: 
 		if (uprf (name, "resent"))
 		    fprintf (ofp, "Prev-");
 		fprintf (ofp, "%s: %s", name, buffer);
 		while (state == FLDPLUS) {
 		    buffersz = sizeof buffer;
-		    state = m_getfld (state, name, buffer, &buffersz, ifp);
+		    state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
 		    fputs (buffer, ofp);
 		}
-		if (state == FLDEOF)
-		    goto process;
 		break;
 
 	    case BODY: 
-	    case BODYEOF: 
 		fclose (ofp);
 
                 cp = m_mktemp2(NULL, "dist", &txtfd, NULL);
                 if (cp == NULL) {
-                    adios("distsbr", "unable to create temporary file");
+		    adios(NULL, "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");
-		unlink (tmpfil);
+		(void) m_unlink (tmpfil);
 		fprintf (ofp, "\n%s", buffer);
 		while (state == BODY) {
 		    buffersz = sizeof buffer;
-		    state = m_getfld (state, name, buffer, &buffersz, ifp);
+		    state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
 		    fputs (buffer, ofp);
 		}
 	    case FILEEOF: 
@@ -202,6 +198,7 @@ ready_msg (char *msgnam)
 	}
     }
 process: ;
+    m_getfld_state_destroy (&gstate);
     fclose (ifp);
     fclose (ofp);
 }