svn commit: r348090 - in head/libexec/bootpd: . bootpgw

Rodney W. Grimes freebsd at gndrsh.dnsmgr.net
Wed May 22 04:25:26 UTC 2019


> Author: markj
> Date: Wed May 22 04:13:57 2019
> New Revision: 348090
> URL: https://svnweb.freebsd.org/changeset/base/348090
> 
> Log:
>   Marginally improve usage() message style in bootpd.
>   
>   - Remove an extra space after "usage:".
>   - Avoid lines exceeding 80 columns.
>   
>   Based on notes from rgrimes.

Thanks, but you missed an important aspect of those notes,
see inline below.

>   
>   MFC with:	r348066
>   Event:		Waterloo Hackathon 2019
> 
> Modified:
>   head/libexec/bootpd/bootpd.c
>   head/libexec/bootpd/bootpgw/bootpgw.c
> 
> Modified: head/libexec/bootpd/bootpd.c
> ==============================================================================
> --- head/libexec/bootpd/bootpd.c	Wed May 22 04:10:24 2019	(r348089)
> +++ head/libexec/bootpd/bootpd.c	Wed May 22 04:13:57 2019	(r348090)
> @@ -587,8 +587,8 @@ PRIVATE void
>  usage()
>  {
>  	fprintf(stderr,
> -			"usage:  bootpd [-a] [-i | -s] [-c chdir-path] [-d level] [-h hostname] [-t timeout]\n");
> -	fprintf(stderr, "               [bootptab [dumpfile]]\n");
> +		"usage: bootpd [-a] [-i | -s] [-c chdir-path] [-d level] [-h hostname]\n"
> +		"              [-t timeout] [bootptab [dumpfile]]\n");
>  	fprintf(stderr, "\t -a\tdon't modify ARP table\n");
>  	fprintf(stderr, "\t -c n\tset current directory\n");
>  	fprintf(stderr, "\t -d n\tset debug level\n");

These 3 printf's are now miss aligned and contain a \t that should not be there:
there may be more, I am only look at what is in context here.
 -  	fprintf(stderr, "\t -a\tdon't modify ARP table\n");
 -  	fprintf(stderr, "\t -c n\tset current directory\n");
 -  	fprintf(stderr, "\t -d n\tset debug level\n");
 + 	fprintf(stderr, "       -a\tdon't modify ARP table\n");
 + 	fprintf(stderr, "       -c n\tset current directory\n");
 + 	fprintf(stderr, "       -d n\tset debug level\n");

Regards,
Rod

> Modified: head/libexec/bootpd/bootpgw/bootpgw.c
> ==============================================================================
> --- head/libexec/bootpd/bootpgw/bootpgw.c	Wed May 22 04:10:24 2019	(r348089)
> +++ head/libexec/bootpd/bootpgw/bootpgw.c	Wed May 22 04:13:57 2019	(r348090)
> @@ -500,7 +500,8 @@ static void
>  usage()
>  {
>  	fprintf(stderr,
> -			"usage:  \nbootpgw [-a] [-d level] [-h count] [-i] [-s] [-t timeout] [-w time] server\n");
> +		"usage: bootpgw [-a] [-i | -s] [-d level] [-h count] [-t timeout]\n"
> +		"               [-w time] server\n");
>  	fprintf(stderr, "\t -a\tdon't modify ARP table\n");
>  	fprintf(stderr, "\t -d n\tset debug level\n");
>  	fprintf(stderr, "\t -h n\tset max hop count\n");
Same comments as above

-- 
Rod Grimes                                                 rgrimes at freebsd.org


More information about the svn-src-head mailing list