diff options
| author | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2006-10-26 16:27:17 +0000 |
|---|---|---|
| committer | rooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68> | 2006-10-26 16:27:17 +0000 |
| commit | bd389c9932e0581b92edd54791e61f1f3f20ea50 (patch) | |
| tree | 688caa4680bb8449c6c586ac5d6da68dd3859d86 | |
| parent | 213b3e129b8742a1f34f84b82e30547102d2bbe6 (diff) | |
| download | libapr-bd389c9932e0581b92edd54791e61f1f3f20ea50.tar.gz | |
Merge r468055 from trunk.
Portably check for EEXIST in the mktemp code.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@468057 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | file_io/unix/mktemp.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,6 @@ Changes with APR 0.9.13 + *) Portably check for EEXIST in mktemp code. PR 40818 + [Kenneth Golomb <KGolomb TradeCard.com>] *) Fix apr_atomic_cas on platforms with 64 bit longs. [Philip Martin <philip codematters.co.uk>] diff --git a/file_io/unix/mktemp.c b/file_io/unix/mktemp.c index 6bb1923fe..0ff945c0f 100644 --- a/file_io/unix/mktemp.c +++ b/file_io/unix/mktemp.c @@ -142,7 +142,7 @@ static int gettemp(char *path, apr_file_t **doopen, apr_int32_t flags, apr_pool_ 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 */ |