Re: svn commit: rev 1234 - trunk/subversion/libsvn_subr

brane@tigris.org wrote:

>Author: brane
>Date: 2002-02-10 15:25 GMT
>New Revision: 1234
>
>Modified:
> trunk/subversion/libsvn_subr/io.c
>Log:
>* subversion/libsvn_subr/io.c (svn_io_copy_file): TEMPORARY WIN32 FIX:
>apr_file_copy will fail on NTFS in most common situations, because APR
>doesn't handle file permissions correctly. This is a temporary solution
>until we either fix APR or handle file copies differently.
>
I fixed this log message to read:

* subversion/libsvn_subr/io.c (svn_io_copy_file): TEMPORARY WIN32 FIX:
apr_file_copy will fail on NTFS in most common situations, because APR
doesn't handle file permissions correctly. This is a temporary solution
until we either fix APR or handle file copies differently.

(svn_set_file_read_only): apr_file_attrs_set isn't implemented on Win32,
so ignore an APR_ENOTIMPL return code.

>
>
>
>Modified: trunk/subversion/libsvn_subr/io.c
>==============================================================================
>--- OLD/trunk/subversion/libsvn_subr/io.c Sun Feb 10 09:25:43 2002
>+++ NEW/trunk/subversion/libsvn_subr/io.c Sun Feb 10 09:25:44 2002
>@@ -185,7 +185,13 @@
> apr_pool_t *pool)
> {
> apr_status_t apr_err;
>+ /* FIXME: apr_file_copy with perms may fail on Win32. We need a platform
>+ - specific implementation to get the permissions right. */
>+#ifndef SVN_WIN32
> apr_int32_t options = copy_perms ? APR_FILE_SOURCE_PERMS : APR_OS_DEFAULT;
>+#else
>+ apr_int32_t options = APR_OS_DEFAULT;
>+#endif
>
> apr_err = apr_file_copy (src, dst, options, pool);
> if (apr_err)
>@@ -365,7 +371,7 @@
>
> attributes |= APR_FILE_ATTR_READONLY;
> status = apr_file_attrs_set (path, attributes, pool);
>- if (!APR_STATUS_IS_SUCCESS(status))
>+ if (status && status != APR_ENOTIMPL)
> return svn_error_createf (status, 0, NULL, pool,
> "failed to set file '%s' read-only", path);
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: svn-help@subversion.tigris.org
>

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org