Completely reworked the path convertion functions

[mmh] / sbr / m_mktemp.c

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index 9b9652b..4a1eed1 100644 (file)
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -41,7 +41,7 @@ static char *get_temp_dir();
 **    char *tmp_pathname = m_mktemp2(NULL, "mypre", ...);
 */
 char *
-m_mktemp (
+m_mktemp(
        const char *pfx_in,  /* Pathname prefix for temporary file. */
        int *fd_ret,         /* (return,opt.) File descriptor to temp file. */
        FILE **fp_ret        /* (return,opt.) FILE pointer to temp file. */
@@ -100,7 +100,7 @@ m_mktemp (
 ** above) is used to create the temp file.
 */
 char *
-m_mktemp2 (
+m_mktemp2(
        const char *dir_in,   /* Directory to place temp file. */
        const char *pfx_in,   /* Basename prefix for temp file. */
        int *fd_ret,          /* (return,opt.) File descriptor to temp file. */
@@ -119,7 +119,7 @@ m_mktemp2 (
                return m_mktemp(buffer, fd_ret, fp_ret);
        }
 
-       if ((cp = r1bindex ((char *)dir_in, '/')) == dir_in) {
+       if ((cp = mhbasename((char *)dir_in)) == dir_in) {
                /* No directory component */
                return m_mktemp(pfx_in, fd_ret, fp_ret);
        }
@@ -144,5 +144,5 @@ get_temp_dir()
                tmpdir = getenv("TMP");
                if (tmpdir != NULL && *tmpdir != '\0') return tmpdir;
        }
-       return m_maildir("");
+       return toabsdir("+");
 }