Re: svn commit: r1426399 - /subversion/trunk/tools/server-side/svnauthz-validate.c

[Daniel Shahaf <da...@elego.de>]

breser@apache.org wrote on Fri, Dec 28, 2012 at 04:35:12 -0000:
> Author: breser
> Date: Fri Dec 28 04:35:11 2012
> New Revision: 1426399
> 
> URL: http://svn.apache.org/viewvc?rev=1426399&view=rev
> Log:
> Fix errors in usage output for svnauthz-validate.
> 
> * tools/server-side/svnauthz-validate.c:
>   (usage): Remove duplicate FILE argument and incorrect bracketing.
> 
> Modified:
>     subversion/trunk/tools/server-side/svnauthz-validate.c
> 
> Modified: subversion/trunk/tools/server-side/svnauthz-validate.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnauthz-validate.c?rev=1426399&r1=1426398&r2=1426399&view=diff
> ==============================================================================
> --- subversion/trunk/tools/server-side/svnauthz-validate.c (original)
> +++ subversion/trunk/tools/server-side/svnauthz-validate.c Fri Dec 28 04:35:11 2012
> @@ -45,7 +45,7 @@ enum {
>  static int
>  usage(const char *argv0)
>  {
> -  printf("Usage:  %s FILE [--username USER [--path FSPATH] [--repository REPOS_NAME]] FILE\n\n", argv0);
> +  printf("Usage:  %s [--username USER] [--path FSPATH] [--repository REPOS_NAME] FILE\n\n", argv0);

That's the wrong fix.

The code is:

  if (os->ind + 1 != argc || (!opts.username && (opts.fspath || opts.repos_name)))

So the bracketing should be:

     printf("Usage:  %s [--username USER [[--path FSPATH] [--repository REPOS_NAME]] FILE\n\n", argv0);

>    printf("Loads the authz file at FILE and validates its syntax.\n"
>           "Optionally prints the access available to USER for FSPATH in\n"
>           "repository with authz name REPOS_NAME.  If FSPATH is omitted, reports\n"
> 
>