X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1691e80890e5d8ba258c51c214a3e91880e1db2b..8c160c7faebe3cd161d7aad3f2b22f2a117dbb3f:/uip/distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index be2716be..bbaeaf51 100644
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -2,11 +2,14 @@
 /*
  * distsbr.c -- routines to do additional "dist-style" processing
  *
- * $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.
  */
 
 #include <h/mh.h>
 #include <fcntl.h>
+#include <h/utils.h>
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;
@@ -25,7 +28,8 @@ int
 distout (char *drft, char *msgnam, char *backup)
 {
     int state;
-    register char *dp, *resent;
+    register unsigned char *dp;
+    register char *resent;
     char name[NAMESZ], buffer[BUFSIZ];
     register FILE *ifp, *ofp;
 
@@ -42,9 +46,9 @@ 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;;)
-	switch (state =
-		m_getfld (state, name, buffer, sizeof buffer, ifp)) {
+    for (state = FLD, resent = NULL;;) {
+	int buffersz = sizeof buffer;
+	switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
 	    case FLD: 
 	    case FLDPLUS: 
 	    case FLDEOF: 
@@ -61,8 +65,8 @@ distout (char *drft, char *msgnam, char *backup)
 		resent = add (buffer, resent);
 		fprintf (ofp, "%s: %s", name, buffer);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name,
-			    buffer, sizeof buffer, ifp);
+		    buffersz = sizeof buffer;
+		    state = m_getfld (state, name, buffer, &buffersz, ifp);
 		    resent = add (buffer, resent);
 		    fputs (buffer, ofp);
 		}
@@ -95,6 +99,7 @@ distout (char *drft, char *msgnam, char *backup)
 	    default: 
 		adios (NULL, "getfld() returned %d", state);
 	}
+    }
 process: ;
     fclose (ifp);
     fflush (ofp);
@@ -126,6 +131,7 @@ ready_msg (char *msgnam)
     int state, out;
     char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
     register FILE *ifp, *ofp;
+    char *cp = NULL;
 
     if (hdrfd != NOTOK)
 	close (hdrfd), hdrfd = NOTOK;
@@ -135,17 +141,20 @@ ready_msg (char *msgnam)
     if ((ifp = fopen (msgnam, "r")) == NULL)
 	adios (msgnam, "unable to open message");
 
-    strncpy (tmpfil, m_tmpfil ("dist"), sizeof(tmpfil));
-    if ((hdrfd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-	adios (tmpfil, "unable to re-open temporary file");
+    cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
+    if (cp == NULL) {
+        adios("distsbr", "unable to create temporary file");
+    }
+    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);
 
-    for (state = FLD;;)
-	switch (state =
-		m_getfld (state, name, buffer, sizeof buffer, ifp)) {
+    for (state = FLD;;) {
+	int buffersz = sizeof buffer;
+	switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
 	    case FLD: 
 	    case FLDPLUS: 
 	    case FLDEOF: 
@@ -153,8 +162,8 @@ ready_msg (char *msgnam)
 		    fprintf (ofp, "Prev-");
 		fprintf (ofp, "%s: %s", name, buffer);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name,
-			    buffer, sizeof buffer, ifp);
+		    buffersz = sizeof buffer;
+		    state = m_getfld (state, name, buffer, &buffersz, ifp);
 		    fputs (buffer, ofp);
 		}
 		if (state == FLDEOF)
@@ -165,17 +174,20 @@ ready_msg (char *msgnam)
 	    case BODYEOF: 
 		fclose (ofp);
 
-		strncpy (tmpfil, m_tmpfil ("dist"), sizeof(tmpfil));
-		if ((txtfd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-		    adios (tmpfil, "unable to open temporary file");
+                cp = m_mktemp2(NULL, "dist", &txtfd, NULL);
+                if (cp == NULL) {
+                    adios("distsbr", "unable to create temporary file");
+                }
+                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);
 		fprintf (ofp, "\n%s", buffer);
 		while (state == BODY) {
-		    state = m_getfld (state, name,
-			    buffer, sizeof buffer, ifp);
+		    buffersz = sizeof buffer;
+		    state = m_getfld (state, name, buffer, &buffersz, ifp);
 		    fputs (buffer, ofp);
 		}
 	    case FILEEOF: 
@@ -188,6 +200,7 @@ ready_msg (char *msgnam)
 	    default: 
 		adios (NULL, "getfld() returned %d", state);
 	}
+    }
 process: ;
     fclose (ifp);
     fclose (ofp);