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);
exit(1);
}
Index: usr.sbin/installboot/installboot.c
===================================================================
RCS file: /cvs/src/usr.sbin/installboot/installboot.c,v
retrieving revision 1.16
diff -u -p -p -u -r1.16 installboot.c
--- usr.sbin/installboot/installboot.c 8 Nov 2022 12:08:53 -
0000 1.16
+++ usr.sbin/installboot/installboot.c 30 Dec 2022 14:01:39 -0000
@@ -38,8 +38,8 @@ char *stage2;
static __dead void
usage(void)
{
- fprintf(stderr, "usage:\t%1$s [-nv] [-r root] disk
[stage1%2$s]\n"
- "\t%1$s [-nv] -p disk\n",
+ fprintf(stderr, "usage: %1$s [-nv] [-r root] disk
[stage1%2$s]\n"
+ " %1$s [-nv] -p disk\n",
getprogname(), (stages >= 2) ? " [stage2]" : "");
exit(1);
Index: usr.sbin/ldomctl/ldomctl.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldomctl/ldomctl.c,v
retrieving revision 1.40
diff -u -p -p -u -r1.40 ldomctl.c
--- usr.sbin/ldomctl/ldomctl.c 24 Oct 2021 21:24:18 -0000 1.40
+++ usr.sbin/ldomctl/ldomctl.c 30 Dec 2022 14:01:39 -0000
@@ -125,13 +125,13 @@ main(int argc, char **argv)
__dead void
usage(void)
{
- fprintf(stderr, "usage:\t%1$s delete|select configuration\n"
- "\t%1$s download directory\n"
- "\t%1$s dump|list|list-io\n"
- "\t%1$s init-system [-n] file\n"
- "\t%1$s create-vdisk -s size file\n"
- "\t%1$s panic|start [-c] domain\n"
- "\t%1$s console|status|stop [domain]\n",
+ fprintf(stderr, "usage: %1$s delete|select configuration\n"
+ " %1$s download directory\n"
+ " %1$s dump|list|list-io\n"
+ " %1$s init-system [-n] file\n"
+ " %1$s create-vdisk -s size file\n"
+ " %1$s panic|start [-c] domain\n"
+ " %1$s console|status|stop [domain]\n",
getprogname());
exit(EXIT_FAILURE);
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);
}
