svn commit: r818843 - in /apr/apr/branches/1.4.x: CHANGES file_io/unix/tempdir.c

[ji...@apache.org]

Author: jim
Date: Fri Sep 25 13:10:40 2009
New Revision: 818843

URL: http://svn.apache.org/viewvc?rev=818843&view=rev
Log:
TMPDIR is canonical

Modified:
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/file_io/unix/tempdir.c

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=818843&r1=818842&r2=818843&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Fri Sep 25 13:10:40 2009
@@ -5,6 +5,9 @@
      Fix overflow in pools and rmm, where size alignment was taking place.
      [Matt Lewis <ma...@google.com>, Sander Striker]
 
+  *) apr_temp_dir_get() now checks the TMPDIR environment variable
+     first, instead of third. [Jim Jagielski]
+
   *) The implementation of expand_array() in tables/apr_hash.c allocates
      a new bucket array, without making any attempt to release the memory 
      allocated for the previous bucket array. That wastes memory: if the 

Modified: apr/apr/branches/1.4.x/file_io/unix/tempdir.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/file_io/unix/tempdir.c?rev=818843&r1=818842&r2=818843&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/file_io/unix/tempdir.c (original)
+++ apr/apr/branches/1.4.x/file_io/unix/tempdir.c Fri Sep 25 13:10:40 2009
@@ -42,7 +42,7 @@
 {
     apr_status_t apr_err;
     const char *try_dirs[] = { "/tmp", "/usr/tmp", "/var/tmp" };
-    const char *try_envs[] = { "TMP", "TEMP", "TMPDIR" };
+    const char *try_envs[] = { "TMPDIR", "TMP", "TEMP"};
     const char *dir;
     char *cwd;
     int i;
@@ -51,9 +51,9 @@
        into.
        Here's the order in which we'll try various paths:
 
+          $TMPDIR
           $TMP
           $TEMP
-          $TMPDIR
           "C:\TEMP"     (windows only)
           "SYS:\TMP"    (netware only)
           "/tmp"