You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/21 19:50:40 UTC
svn commit: r1436549 - /subversion/trunk/subversion/libsvn_subr/io.c
Author: rhuijben
Date: Mon Jan 21 18:50:40 2013
New Revision: 1436549
URL: http://svn.apache.org/viewvc?rev=1436549&view=rev
Log:
* subversion/libsvn_subr/io.c
(svn_io_stat_dirent2): Most likely fix this code for MAC OS, where
the stat call returned APR_INCOMPLETE.
Modified:
subversion/trunk/subversion/libsvn_subr/io.c
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1436549&r1=1436548&r2=1436549&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Mon Jan 21 18:50:40 2013
@@ -2506,7 +2506,7 @@ svn_io_stat_dirent2(const svn_io_dirent2
apr_int32_t wanted = APR_FINFO_TYPE | APR_FINFO_LINK
| APR_FINFO_SIZE | APR_FINFO_MTIME;
-#if defined(WIN32) || defined(__OS2__) || defined(DARWIN)
+#if defined(WIN32) || defined(__OS2__)
if (verify_truename)
wanted |= APR_FINFO_NAME;
#endif
@@ -2535,6 +2535,7 @@ svn_io_stat_dirent2(const svn_io_dirent2
{
/* No parent directory. No need to stat/verify */
}
+#if defined(WIN32) || defined(__OS2__)
else if (finfo.name)
{
const char *name_on_disk;
@@ -2555,8 +2556,9 @@ svn_io_stat_dirent2(const svn_io_dirent2
name_on_disk);
}
}
-#if defined(DARWIN)
- /* Currently apr doesn't set finfo.name on DARWIN.
+#elif defined(DARWIN)
+ /* Currently apr doesn't set finfo.name on DARWIN, returning
+ APR_INCOMPLETE.
### Can we optimize this in another way? */
else
{