Added -debug switch to pick(1) and deprecated $MHPDEBUG.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 30046a3b6f13a1ef30a0309d309e6b3f3b08bc11..020949d0a40894bf918ba8b3721262a8ee1463b2 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;
     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
 
     /*
      * 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) {
         * 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;
        }
                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) {
         */
        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 {
                               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 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)
                                 sizeof(buffer))) == NOTOK)

-           advise (buffer, "unable to rename %s to", (char *) drft);
+           advise (buffer, "unable to rename %s to", drft);

        break;
 
     default: 
        break;
 
     default: 


@@ -137,7 +135,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
 
     done=exit;
     if (distfile)
 
     done=exit;
     if (distfile)

-       unlink (distfile);
+       (void) m_unlink (distfile);

 
     return status;
 }
 
     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) {
 
        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));
         }
        strncpy(tmpdrf, cp, sizeof(tmpdrf));

-       chmod (tmpdrf, 0600);

 
        /*
         * Output the header fields
 
        /*
         * 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);
 
        snprintf (partnum, sizeof(partnum), "%d", partno);
        status = sendaux (vec, vecp, program, tmpdrf, st);

-       unlink (tmpdrf);
+       (void) m_unlink (tmpdrf);

        if (status != OK)
            break;
 
        if (status != OK)
            break;
 


@@ -398,7 +396,8 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
            snprintf (buf, sizeof(buf), "%d", fd2);
            vec[vecp++] = buf;
        } else {
            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());

        }
     }
     if (distfile && distout (drft, distfile, backup) == NOTOK)
        }
     }
     if (distfile && distout (drft, distfile, backup) == NOTOK)


@@ -453,7 +452,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
            if (annotext && fd2 != NOTOK)
                close (fd2);
            if (distfile) {
            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);
            }
                if (rename (backup, drft) == NOTOK)
                    advise (drft, "unable to rename %s to", backup);
            }


@@ -539,16 +538,14 @@ static int
 tmp_fd (void)
 {
     int fd;
 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 (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;
            advise (tfile, "unable to remove");
 
     return fd;


@@ -591,6 +588,8 @@ anno (int fd, struct stat *st)
            sigaddset (&set, SIGTERM);
            sigprocmask (SIG_BLOCK, &set, &oset);
 
            sigaddset (&set, SIGTERM);
            sigprocmask (SIG_BLOCK, &set, &oset);
 

+           unregister_for_removal(0);
+

            annoaux (fd);
            if (child_id == OK)
                _exit (0);
            annoaux (fd);
            if (child_id == OK)
                _exit (0);