svn commit: r468056 - in /apr/apr/branches/1.2.x: CHANGES file_io/unix/mktemp.c

[ro...@apache.org]

Author: rooneg
Date: Thu Oct 26 09:26:12 2006
New Revision: 468056

URL: http://svn.apache.org/viewvc?view=rev&rev=468056
Log:
Merge r468055 from trunk.

Portably check for EEXIST in the mktemp code.

Modified:
    apr/apr/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/file_io/unix/mktemp.c

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?view=diff&rev=468056&r1=468055&r2=468056
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES (original)
+++ apr/apr/branches/1.2.x/CHANGES Thu Oct 26 09:26:12 2006
@@ -1,4 +1,6 @@
 Changes for APR 1.2.8
+  *) Portably check for EEXIST in mktemp code.  PR 40818
+     [Kenneth Golomb <KGolomb TradeCard.com>]
 
   *) Fix apr_snprintf/apr_vsnprintf return value to not count the
      NUL terminator in the overflow case.  PR 39996.

Modified: apr/apr/branches/1.2.x/file_io/unix/mktemp.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/file_io/unix/mktemp.c?view=diff&rev=468056&r1=468055&r2=468056
==============================================================================
--- apr/apr/branches/1.2.x/file_io/unix/mktemp.c (original)
+++ apr/apr/branches/1.2.x/file_io/unix/mktemp.c Thu Oct 26 09:26:12 2006
@@ -142,7 +142,7 @@
         if ((rv = apr_file_open(doopen, path, flags,
                                 APR_UREAD | APR_UWRITE, p)) == APR_SUCCESS)
             return APR_SUCCESS;
-        if (rv != APR_EEXIST)
+        if (!APR_STATUS_IS_EEXIST(rv))
             return rv;
 
         /* If we have a collision, cycle through the space of filenames */