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

[Karl Fogel <kf...@newton.ch.collab.net>]

brane@tigris.org writes:
> * subversion/libsvn_subr/io.c (svn_io_copy_file): Disable permission copying
> on Windows, as it was before r3484.

Shouldn't we maybe

   1. Fix the documentation in apr/include/apr_file_io.h to indicate
      that apr_file_info_get() can return APR_INCOMPLETE

and possibly:

   2. Check for that APR_INCOMPLETE in the copy_perms!=0 case in
      svn_io_copy_file()

?

In any case, the comment added in this change is a bit misleading.
svn_io_copy_file() no longer asks apr_file_copy() to copy perms, so
the only issue here is with apr_file_info_get().

-Karl

> Modified: trunk/subversion/libsvn_subr/io.c
> ==============================================================================
> --- trunk/subversion/libsvn_subr/io.c	(original)
> +++ trunk/subversion/libsvn_subr/io.c	Sun Oct 27 15:45:15 2002
> @@ -211,6 +211,14 @@
>    const char *src_native, *dst_native;
>    const char *dst_tmp;
>  
> +#ifdef SVN_WIN32
> +  /* ### FIXME: apr_file_copy with perms, or anything that expects
> +     that apr_file_info_get with APR_FILE_PROT will never return
> +     APR_INCOMPLETE, may fail on Win32.  We need a platform-specific
> +     implementation to get the permissions right. */
> +  copy_perms = FALSE;
> +#endif
> +
>    SVN_ERR (svn_utf_cstring_from_utf8 (&src_native, src, pool));
>    SVN_ERR (svn_utf_cstring_from_utf8 (&dst_native, dst, pool));
>  
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Karl Fogel <kf...@newton.ch.collab.net>]

Branko Čibej <br...@xbc.nu> writes:
> >   1. Fix the documentation in apr/include/apr_file_io.h to indicate
> >      that apr_file_info_get() can return APR_INCOMPLETE
> >
> I thought that was clear for all functions returning file info,
> including this one and apr_stat.

Ah -- I hadn't realized that, but it does sort of make sense.

> Ah, but according to the New Plan we'll go back to asking apr_file_copy
> to copy the permissions. My comment is future-proof. :-)

:-)  Can't argue with that!

I'll make the change right away, please review when you see it (not
that you ever need to be asked).

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Branko Čibej <br...@xbc.nu>]

Karl Fogel wrote:

>brane@tigris.org writes:
>  
>
>>* subversion/libsvn_subr/io.c (svn_io_copy_file): Disable permission copying
>>on Windows, as it was before r3484.
>>    
>>
>
>Shouldn't we maybe
>
>   1. Fix the documentation in apr/include/apr_file_io.h to indicate
>      that apr_file_info_get() can return APR_INCOMPLETE
>
I thought that was clear for all functions returning file info,
including this one and apr_stat.

>and possibly:
>
>   2. Check for that APR_INCOMPLETE in the copy_perms!=0 case in
>      svn_io_copy_file()
>
I don't think so. I'd rather leave the warning in, and later fix
apr_file_copy to copy permissions on Windows; it shouldn't be too hard.

>In any case, the comment added in this change is a bit misleading.
>svn_io_copy_file() no longer asks apr_file_copy() to copy perms, so
>the only issue here is with apr_file_info_get().
>
Ah, but according to the New Plan we'll go back to asking apr_file_copy
to copy the permissions. My comment is future-proof. :-)


-- 
Brane Čibej   <br...@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