Sort JSON output from oauth tests so that comparisons don't

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 30046a3b6f13a1ef30a0309d309e6b3f3b08bc11..07c7f9741c406ad5ca80a893d9aba1c894543dba 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -60,7 +60,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
     char buffer[BUFSIZ], file[BUFSIZ];
     struct stat sts;
     char **buildvec, *buildprogram;
-    volatile char *drft = draft;
+    char *volatile drft = draft;
 
     /*
      * Run the mimebuildproc (which is by default mhbuild) on the message
@@ -99,12 +99,12 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
         * rename the draft file.  I'm not quite sure why.
         */
        if (pushsw && unique) {
-            char *cp = m_mktemp2((char *) drft, invo_name, NULL, NULL);
-            if (cp == NULL) {
-                adios ("sendsbr", "unable to create temporary file");
-            }
-           if (rename ((char *) drft,
-                       strncpy(file, cp, sizeof(file))) == NOTOK)
+           char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
+           if (cp == NULL) {
+               adios(NULL, "unable to create temporary file in %s",
+                     get_temp_dir());
+           }
+           if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK)
                adios (file, "unable to rename %s to", drft);
            drft = file;
        }
@@ -115,19 +115,17 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
         */
        if (splitsw >= 0 && !distfile && stat ((char *) drft, &sts) != NOTOK
                && sts.st_size >= CPERMSG) {
-           status = splitmsg (vec, vecp, program, (char *) drft,
+           status = splitmsg (vec, vecp, program, drft,
                               st, splitsw) ? NOTOK : OK;
        } else {
-           status = sendaux (vec, vecp, program, (char *) drft,
-                             st) ? NOTOK : OK;
+           status = sendaux (vec, vecp, program, drft, st) ? NOTOK : OK;
        }
 
        /* rename the original draft */
        if (rename_drft && status == OK &&
-               rename ((char *) drft,
-                       strncpy (buffer, m_backup ((char *) drft),
+               rename (drft, strncpy (buffer, m_backup (drft),
                                 sizeof(buffer))) == NOTOK)
-           advise (buffer, "unable to rename %s to", (char *) drft);
+           advise (buffer, "unable to rename %s to", drft);
        break;
 
     default: 
@@ -137,7 +135,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
 
     done=exit;
     if (distfile)
-       unlink (distfile);
+       (void) m_unlink (distfile);
 
     return status;
 }
@@ -289,10 +287,10 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
        char *cp = m_mktemp2(drft, invo_name, NULL, &out);
         if (cp == NULL) {
-           adios (drft, "unable to create temporary file for");
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
         }
        strncpy(tmpdrf, cp, sizeof(tmpdrf));
-       chmod (tmpdrf, 0600);
 
        /*
         * Output the header fields
@@ -356,7 +354,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
        snprintf (partnum, sizeof(partnum), "%d", partno);
        status = sendaux (vec, vecp, program, tmpdrf, st);
-       unlink (tmpdrf);
+       (void) m_unlink (tmpdrf);
        if (status != OK)
            break;
 
@@ -391,16 +389,17 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
     fd = pushsw ? tmp_fd () : NOTOK;
     fd2 = NOTOK;
 
-    vec[vecp++] = drft;
     if (annotext) {
        if ((fd2 = tmp_fd ()) != NOTOK) {
            vec[vecp++] = "-idanno";
            snprintf (buf, sizeof(buf), "%d", fd2);
            vec[vecp++] = buf;
        } else {
-           admonish (NULL, "unable to create file for annotation list");
+           admonish (NULL, "unable to create temporary file in %s "
+                      "for annotation list", get_temp_dir());
        }
     }
+    vec[vecp++] = drft;
     if (distfile && distout (drft, distfile, backup) == NOTOK)
        done (1);
     vec[vecp] = NULL;
@@ -453,7 +452,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
            if (annotext && fd2 != NOTOK)
                close (fd2);
            if (distfile) {
-               unlink (drft);
+               (void) m_unlink (drft);
                if (rename (backup, drft) == NOTOK)
                    advise (drft, "unable to rename %s to", backup);
            }
@@ -499,13 +498,19 @@ alert (char *file, int out)
                } else {
                    lseek (out, (off_t) 0, SEEK_END);
                    strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
-                   write (out, buf, strlen (buf));
+                   if (write (out, buf, strlen (buf)) < 0) {
+                       advise (file, "write");
+                   }
                    strncpy (buf, "\n------- Unsent Draft\n\n", sizeof(buf));
-                   write (out, buf, strlen (buf));
+                   if (write (out, buf, strlen (buf)) < 0) {
+                       advise (file, "write");
+                   }
                    cpydgst (in, out, file, "temporary file");
                    close (in);
                    strncpy (buf, "\n------- End of Unsent Draft\n", sizeof(buf));
-                   write (out, buf, strlen (buf));
+                   if (write (out, buf, strlen (buf)) < 0) {
+                       advise (file, "write");
+                   }
                    if (rename (file, strncpy (buf, m_backup (file), sizeof(buf))) == NOTOK)
                        admonish (buf, "unable to rename %s to", file);
                }
@@ -539,16 +544,14 @@ static int
 tmp_fd (void)
 {
     int fd;
-    char *tfile = NULL;
+    char *tfile;
 
-    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
-    if (tfile == NULL) return NOTOK;
-    fchmod(fd, 0600);
+    if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) return NOTOK;
 
     if (debugsw)
        advise (NULL, "temporary file %s selected", tfile);
     else
-       if (unlink (tfile) == NOTOK)
+       if (m_unlink (tfile) == NOTOK)
            advise (tfile, "unable to remove");
 
     return fd;
@@ -591,6 +594,8 @@ anno (int fd, struct stat *st)
            sigaddset (&set, SIGTERM);
            sigprocmask (SIG_BLOCK, &set, &oset);
 
+           unregister_for_removal(0);
+
            annoaux (fd);
            if (child_id == OK)
                _exit (0);
@@ -598,7 +603,9 @@ anno (int fd, struct stat *st)
            /* reset the signal mask */
            sigprocmask (SIG_SETMASK, &oset, &set);
 
-           chdir (cwd);
+           if (chdir (cwd) < 0) {
+               advise (cwd, "chdir");
+           }
            break;
 
        default:                /* no waiting... */