[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r16381 - trunk/subversion/libsvn_wc

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-10-01 00:24:25 CEST

dionisos@tigris.org writes:

> Author: dionisos
> Date: Fri Sep 30 16:45:51 2005
> New Revision: 16381
>
> Modified:
> trunk/subversion/libsvn_wc/entries.c
>
> Log:
> Fix svn_wc_entry() called with a path argument of SVN_WC_ENTRY_THIS_DIR.

SVN_WC_ENTRY_THIS_DIR is not a path, you should not pass it to
svn_wc_entry.

> * subversion/libsvn_wc/entries.c (svn_wc_entry): When called with a path
> of SVN_WC_ENTRY_THIS_DIR, use adm_access directly.
>
>
>
> Modified: trunk/subversion/libsvn_wc/entries.c
> Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_wc/entries.c?rev=16381&p1=trunk/subversion/libsvn_wc/entries.c&p2=trunk/subversion/libsvn_wc/entries.c&r1=16380&r2=16381
> ==============================================================================
> --- trunk/subversion/libsvn_wc/entries.c (original)
> +++ trunk/subversion/libsvn_wc/entries.c Fri Sep 30 16:45:51 2005
> @@ -766,7 +766,12 @@
> const char *entry_name;
> svn_wc_adm_access_t *dir_access;
>
> - SVN_ERR (svn_wc__adm_retrieve_internal (&dir_access, adm_access, path, pool));
> + if (strcmp (path, SVN_WC_ENTRY_THIS_DIR) == 0)
> + dir_access = adm_access;

SVN_WC_ENTRY_THIS_DIR happens to be "" which is also a valid path.

If someone passes "" they need to get the access baton that has "" as
it's path and not the access baton that happened to be passed in.

> + else
> + SVN_ERR (svn_wc__adm_retrieve_internal (&dir_access,
> + adm_access, path, pool));
> +

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 1 00:25:21 2005

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.