Fix two errors in the conversion to m_mktemp2():

- There was an off-by-one error that prevented the temporary file
  from being created in the same directory as the message it was being
  linked to.
- When using "dist", the assumption was that the temporary file would not
  exist when m_scratch was called (it wanted to link() to the name).  This
  was solved by simply unlink()ing the temporary file after it was created.

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index aa25636a95eda47cb12171d9fe5e845fe72a7f91..9f99119e1bb04fe88a5b8ad8894f862d596c346f 100644 (file)
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -121,7 +121,7 @@ m_mktemp2 (
         /* No directory component */
         return m_mktemp(pfx_in, fd_ret, fp_ret);
     }
-    n = (int)(cp-dir_in-1); /* Length of dir component */
+    n = (int)(cp-dir_in); /* Length of dir component */
     snprintf(buffer, sizeof(buffer), "%.*s%s", n, dir_in, pfx_in);
     return m_mktemp(buffer, fd_ret, fp_ret);
 }

diff --git a/uip/send.c b/uip/send.c
index 39d425f57ba9c91f3c030978fd055fec4f2c6340..62bf60ae3fbd2cf6a90e1cffd73caec261310bc6 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -426,6 +426,7 @@ go_to_it:
            && altmsg) {
        vec[vecp++] = "-dist";
        distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
+       unlink(distfile);
        if (link (altmsg, distfile) == NOTOK) {
            if (errno != EXDEV
 #ifdef EISREMOTE

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 7db5c58873e9d47ca981ca21ed02fa62db8d14e2..c3d93ff6b65e352f1c4ee7c70997e99454a4b5ab 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -1313,6 +1313,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
            && altmsg) {
        vec[vecp++] = "-dist";
        distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
+       unlink(distfile);
        if (link (altmsg, distfile) == NOTOK)
            adios (distfile, "unable to link %s to", altmsg);
     } else {