On 2022-12-30 15:06 +01, David Demelier <[email protected]> wrote:
> On Fri, 2022-12-30 at 14:50 +0100, Florian Obser wrote:
>> That seems reasonable. This might be the full list, do you want to do
>> all?
>>
>> usr.bin/htpasswd/htpasswd.c: fprintf(stderr, "usage:\t%s [file]
>> login\n", __progname);
>> usr.sbin/installboot/installboot.c: fprintf(stderr, "usage:\t%1$s
>> [-nv] [-r root] disk [stage1%2$s]\n"
>> usr.sbin/ldomctl/ldomctl.c: fprintf(stderr, "usage:\t%1$s
>> delete|select configuration\n"
>> usr.sbin/vmctl/main.c: fprintf(stderr, "usage:\t%s [-v] command [arg
>> ...]\n", __progname);
>> usr.sbin/vmctl/main.c: fprintf(stderr, "usage:\t%s [-v] %s %s\n",
>> __progname,
>>
>
> Thanks for the hint, there's the updated diff.
>
> Index: usr.bin/htpasswd/htpasswd.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/htpasswd/htpasswd.c,v
> retrieving revision 1.18
> diff -u -p -p -u -r1.18 htpasswd.c
> --- usr.bin/htpasswd/htpasswd.c 12 Jul 2021 15:09:19 -0000 1.18
> +++ usr.bin/htpasswd/htpasswd.c 30 Dec 2022 14:01:38 -0000
> @@ -36,8 +36,8 @@ extern char *__progname;
> __dead void
> usage(void)
> {
> - fprintf(stderr, "usage:\t%s [file] login\n", __progname);
> - fprintf(stderr, "\t%s -I [file]\n", __progname);
> + fprintf(stderr, "usage: %s [file] login\n", __progname);
> + fprintf(stderr, " %s -I [file]\n", __progname);
Sorry, I should have looked close what's going on. I don't think this is
an improvement. Your original diff was better. Sorry for sending you on
a wild goose chase.
The following chunks are OK florian
> Index: usr.sbin/vmctl/main.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/vmctl/main.c,v
> retrieving revision 1.73
> diff -u -p -p -u -r1.73 main.c
> --- usr.sbin/vmctl/main.c 1 Sep 2022 15:43:07 -0000 1.73
> +++ usr.sbin/vmctl/main.c 30 Dec 2022 14:01:40 -0000
> @@ -96,7 +96,7 @@ usage(void)
> {
> extern char *__progname;
>
> - fprintf(stderr, "usage:\t%s [-v] command [arg ...]\n",
> __progname);
> + fprintf(stderr, "usage: %s [-v] command [arg ...]\n",
> __progname);
>
> exit(1);
> }
> @@ -106,7 +106,7 @@ ctl_usage(struct ctl_command *ctl)
> {
> extern char *__progname;
>
> - fprintf(stderr, "usage:\t%s [-v] %s %s\n", __progname,
> + fprintf(stderr, "usage: %s [-v] %s %s\n", __progname,
> ctl->name, ctl->usage);
> exit(1);
> }
>
--
I'm not entirely sure you are real.
