Use RFC 2047 encoding for Content-Description, and make sure to encode

[nmh] / uip / distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 457536a318b4a72be3bfdb76d2a0110f17e86afc..2d9239e92fd4495f627ceaf1d2896fa23af9ef25 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -28,11 +28,10 @@ int
 distout (char *drft, char *msgnam, char *backup)
 {
     int state;
-    register unsigned char *dp;
-    register char *resent;
+    char *dp, *resent;
     char name[NAMESZ], buffer[BUFSIZ];
     register FILE *ifp, *ofp;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if (rename (drft, strcpy (backup, m_backup (drft))) == NOTOK)
        adios (backup, "unable to rename %s to",drft);
@@ -47,10 +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);
 
-    m_getfld_state_init (&gstate);
     for (resent = NULL;;) {
        int buffersz = sizeof buffer;
-       switch (state = m_getfld (gstate, name, buffer, &buffersz, ifp)) {
+       switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
            case FLD: 
            case FLDPLUS: 
                if (uprf (name, "distribute-"))
@@ -67,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_getfld (&gstate, name, buffer, &buffersz, ifp);
                    resent = add (buffer, resent);
                    fputs (buffer, ofp);
                }
@@ -75,7 +73,7 @@ distout (char *drft, char *msgnam, char *backup)
 
            case BODY: 
                for (dp = buffer; *dp; dp++)
-                   if (!isspace (*dp)) {
+                   if (!isspace ((unsigned char) *dp)) {
                        advise (NULL, BADTXT, "draft");
                        goto leave_bad;
                    }
@@ -89,7 +87,7 @@ distout (char *drft, char *msgnam, char *backup)
        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;
@@ -106,7 +104,7 @@ process: ;
     if (!resent) {
        advise (NULL, 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;
@@ -131,7 +129,7 @@ ready_msg (char *msgnam)
     char name[NAMESZ], buffer[BUFSIZ], tmpfil[BUFSIZ];
     register FILE *ifp, *ofp;
     char *cp = NULL;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if (hdrfd != NOTOK)
        close (hdrfd), hdrfd = NOTOK;
@@ -143,19 +141,17 @@ ready_msg (char *msgnam)
 
     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);
 
-    m_getfld_state_init (&gstate);
     for (;;) {
        int buffersz = sizeof buffer;
-       switch (state = m_getfld (gstate, name, buffer, &buffersz, ifp)) {
+       switch (state = m_getfld (&gstate, name, buffer, &buffersz, ifp)) {
            case FLD: 
            case FLDPLUS: 
                if (uprf (name, "resent"))
@@ -163,7 +159,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_getfld (&gstate, name, buffer, &buffersz, ifp);
                    fputs (buffer, ofp);
                }
                break;
@@ -173,18 +169,19 @@ ready_msg (char *msgnam)
 
                 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 (gstate, name, buffer, &buffersz, ifp);
+                   state = m_getfld (&gstate, name, buffer, &buffersz, ifp);
                    fputs (buffer, ofp);
                }
            case FILEEOF: