mhbuildsbr.c: Ensure temporary FILE closed regardless of success.

[nmh] / uip / distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index bdea4b144c3f79906081a9a1f629a5ef678de81c..f29426e24c37a129f90cf0a3de9de88751a82326 100644 (file)
--- 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
  *
  * 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 <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>

+#include "../sbr/m_mktemp.h"

 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;


@@ -29,9 +28,9 @@ distout (char *drft, char *msgnam, char *backup)
 {
     int state;
     char *dp, *resent;
 {
     int state;
     char *dp, *resent;

-    char name[NAMESZ], buffer[BUFSIZ];
+    char name[NAMESZ], buffer[NMH_BUFSIZ];

     FILE *ifp, *ofp;
     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);
 
     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);
     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);
 
     cpydata (hdrfd, fileno (ofp), msgnam, drft);
 

+    gstate = m_getfld_state_init(ifp);

     for (resent = NULL;;) {
        int buffersz = sizeof buffer;
     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-"))
            case FLD: 
            case FLDPLUS: 
                if (uprf (name, "distribute-"))


@@ -65,7 +65,7 @@ distout (char *drft, char *msgnam, char *backup)
                fprintf (ofp, "%s: %s", name, buffer);
                while (state == FLDPLUS) {
                    buffersz = sizeof buffer;
                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);
                }
                    resent = add (buffer, resent);
                    fputs (buffer, ofp);
                }


@@ -112,7 +112,7 @@ process: ;
     free (resent);
 
     if (txtfd != NOTOK) {
     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);
     }
 
        cpydata (txtfd, fileno (ofp), msgnam, drft);
     }
 


@@ -126,15 +126,19 @@ static void
 ready_msg (char *msgnam)
 {
     int state, out;
 ready_msg (char *msgnam)
 {
     int state, out;

-    char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
+    char name[NAMESZ], buffer[NMH_BUFSIZ], tmpfil[BUFSIZ];

     FILE *ifp, *ofp;
     char *cp = NULL;
     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");
 
     if ((ifp = fopen (msgnam, "r")) == NULL)
        adios (msgnam, "unable to open message");


@@ -149,9 +153,10 @@ ready_msg (char *msgnam)
        adios (NULL, "no file descriptors -- you lose big");
     (void) m_unlink (tmpfil);
 
        adios (NULL, "no file descriptors -- you lose big");
     (void) m_unlink (tmpfil);
 

+    gstate = m_getfld_state_init(ifp);

     for (;;) {
        int buffersz = sizeof buffer;
     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"))
            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;
                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;
                    fputs (buffer, ofp);
                }
                break;


@@ -181,7 +186,7 @@ ready_msg (char *msgnam)
                fprintf (ofp, "\n%s", buffer);
                while (state == BODY) {
                    buffersz = sizeof buffer;
                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: 
                    fputs (buffer, ofp);
                }
            case FILEEOF: