On 10/09/15 19:06, Tim van der Molen wrote:
> Michael Reed (2015-10-09 23:21 +0200):
>> On 10/09/15 11:03, Tim van der Molen wrote:
>>> Michael Reed (2015-10-09 09:10 +0200):
>>>> The argument passed to usage() was always the same (argv[0]), so
>>>> this patch removes the parameter and uses __progname instead.
>>>> The usage message was misaligned, so I fixed that as well.
>>>
>>> This has already been addressed in a diff I will commit shortly. Thanks
>>> though.
>>>
>>
>> Thanks Tim (and Theo for the style comments). By the way, the usage
>> message is still misaligned; could you take a look at this updated diff?
>
> Hi Michael,
>
> A quick grep through /usr/src/*bin reveals that various forms of
> indentation are used, and that there's no prevalent one. So I don't
> think this is worth changing.
This was mainly done so the synopsis printed by usage() has the same
type of indentation as that in the manual page (all mdoc manuals seem
to have this property), but I see that the type of indentation is indeed
inconsistent, so it's no big deal.
>
>> Index: skey.c
>> ===================================================================
>> RCS file: /cvs/src/usr.bin/skey/skey.c,v
>> retrieving revision 1.30
>> diff -u -p -r1.30 skey.c
>> --- skey.c 9 Oct 2015 20:24:37 -0000 1.30
>> +++ skey.c 9 Oct 2015 21:13:59 -0000
>> @@ -148,7 +148,7 @@ void
>> usage(void)
>> {
>> fprintf(stderr,
>> - "usage: %s [-x] [-md5 | -rmd160 | -sha1] [-n count]\n\t"
>> - "[-p passphrase] <sequence#>[/] key\n", __progname);
>> + "usage: %s [-x] [-md5 | -rmd160 | -sha1] [-n count]\n"
>> + " [-p passphrase] <sequence#>[/] key\n", __progname);
>> exit(1);
>> }
