No longer look at TMP environment variable for temporary file storage.

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index b2d2a82a006aa3a26f12145b3df53aea4006ee90..ca1bff37702f565c4b55dbfbfdd58d1b0d5b61b6 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -117,6 +117,10 @@ OBSOLETE FEATURES
 - The environment variable MM_CHARSET to indicate the native character
   set is no longer supported.  The native character set will be solely
   determined by the locale settings.
 - The environment variable MM_CHARSET to indicate the native character
   set is no longer supported.  The native character set will be solely
   determined by the locale settings.

+- Temporary files are stored in the first non-null location of
+  {MHTMPDIR environment variable, TMPDIR environment variable, MH Path}.
+  They are no longer be stored in the location specified by the TMP
+  environment variable.

 
 -------------------
 DEPRECATED FEATURES
 
 -------------------
 DEPRECATED FEATURES

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index ac05306a96cb33b4c9c40ef947a3157ab0ed3700..a9dab5a24168bc41455e87b7d332dce20902b4a7 100644 (file)
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -32,7 +32,6 @@ static void register_for_removal(const char *);
  *
  *    MHTMPDIR envvar
  *    TMPDIR envvar
  *
  *    MHTMPDIR envvar
  *    TMPDIR envvar

- *    TMP envvar

  *    User's mail directory.
  *
  *  NOTE: One will probably use m_mktemp2() instead of this function.
  *    User's mail directory.
  *
  *  NOTE: One will probably use m_mktemp2() instead of this function.


@@ -144,9 +143,6 @@ get_temp_dir()
 
         tmpdir = getenv("TMPDIR");
         if (tmpdir != NULL && *tmpdir != '\0') return tmpdir;
 
         tmpdir = getenv("TMPDIR");
         if (tmpdir != NULL && *tmpdir != '\0') return tmpdir;

-
-        tmpdir = getenv("TMP");
-        if (tmpdir != NULL && *tmpdir != '\0') return tmpdir;

     }
     return m_maildir("");
 }
     }
     return m_maildir("");
 }