On Wed, Sep 12, 2018 at 05:40:49PM +0100, Jason McIntyre wrote:
> On Wed, Sep 12, 2018 at 11:50:18AM +0200, Sascha Paunovic wrote:
> > Since C99, string literal concatenation is provided, allowing the number
> > of printf() calls to be greatly reduced (20 -> 1).
> >
> > This is my first diff I'm sending, feedback would be very appreciated.
> >
>
> hi.
>
> i'm all for the diff but... generally usage() does not spit out a
> description of the options (with some exceptions). if you look at the
> man page, the irony is that the usage seems more verbose.
>
> anyone object to removing the list that follows the synopsis? if not,
> i'd prefer that.
>
> unrelated question: anyone know why the argument to -g is "gap3len"?
>
> jmc
>
ok, so here's the diff i propose. yay? nay?
jmc
Index: fdformat.c
===================================================================
RCS file: /cvs/src/usr.sbin/fdformat/fdformat.c,v
retrieving revision 1.22
diff -u -r1.22 fdformat.c
--- fdformat.c 16 Mar 2016 15:41:11 -0000 1.22
+++ fdformat.c 16 Sep 2018 21:46:04 -0000
@@ -132,26 +132,10 @@
static void
usage(void)
{
- printf("usage: %s [-nqv] [-c cyls] [-F fillbyte] [-g gap3len] ",
- __progname);
- printf("[-h heads]\n");
- printf("\t[-i intleave] [-r rate] [-S secshft] [-s secs]\n");
- printf("\t[-t steps_per_track] device_name\n");
- printf("Options:\n");
- printf("\t-n\tdon't verify floppy after formatting\n");
- printf("\t-q\tsuppress any normal output, don't ask for
confirmation\n");
- printf("\t-v\tdon't format, verify only\n");
- printf("\tdevname\tthe full name of floppy device or in short form fd0,
fd1\n");
- printf("Obscure options:\n");
- printf("\t-c #\tspecify number of cylinders, 40 or 80\n");
- printf("\t-F #\tspecify fill byte\n");
- printf("\t-g #\tspecify gap length\n");
- printf("\t-h #\tspecify number of floppy heads, 1 or 2\n");
- printf("\t-i #\tspecify interleave factor\n");
- printf("\t-r #\tspecify data rate, 250, 300 or 500 kbps\n");
- printf("\t-S #\tspecify sector size, 0=128, 1=256, 2=512 bytes\n");
- printf("\t-s #\tspecify number of sectors per track, 9, 10, 15 or
18\n");
- printf("\t-t #\tnumber of steps per track\n");
+ printf("usage: %s [-nqv] [-c cyls] [-F fillbyte] [-g gap3len] "
+ "[-h heads]\n"
+ " [-i intleave] [-r rate] [-S secshft] [-s secs]\n"
+ " [-t steps_per_track] device_name\n", __progname);
exit(2);
}
