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

[Rodney W. Grimes]

> On Tue, May 21, 2019 at 09:25:23PM -0700, Rodney W. Grimes wrote:
> > > 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");
> 
> They were seemingly misaligned before too.
> 
> Before:
> usage:  bootpd [-i | -s] [-c chdir-path] [-d level] [-h hostname] [-t timeout]
>                [bootptab [dumpfile]]
>          -c n   set current directory
>          -d n   set debug level
>          -h n   set the hostname to listen on
>          -i     force inetd mode (run as child of inetd)
>          -s     force standalone mode (run without inetd)
>          -t n   set inetd exit timeout to n minutes
> 
> After:
> usage: bootpd [-a] [-i | -s] [-c chdir-path] [-d level] [-h hostname]
>               [-t timeout] [bootptab [dumpfile]]
>          -a     don't modify ARP table
>          -c n   set current directory
>          -d n   set debug level
>          -h n   set the hostname to listen on
>          -i     force inetd mode (run as child of inetd)
>          -s     force standalone mode (run without inetd)
>          -t n   set inetd exit timeout to n minutes
> 
> To be honest I have no desire to spend more time on bootpd than I
> already have.  You are welcome to improve the usage formatting if
> you like.

omg, really?  Old "folke lore"  You touched, you own it.

If I didnt have to go through bde and/or phk I would of just gone
and commited the clean up.  I have handed you the diff.

Perhaps a phab review before would of made this less painfull.
And perhaps a phab review once an issue had been raised would
of been really less painful.

-- 
Rod Grimes                                                 rgrimes at freebsd.org