volume_id/ext: detect ext4 too

[oweals/busybox.git] / util-linux / fdformat.c

diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index dc45e23c0a05b50196f2be1dc5c84325b886fecc..2f0854a3031f6c38922c667866cbe40f57065b44 100644 (file)
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -1,14 +1,16 @@
 /* vi: set sw=4 ts=4: */
-/* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger */
-
-/* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
- * - added Native Language Support
- * 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- * - more i18n/nls translatable strings marked
- *
+/* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger
  * 5 July 2003 -- modified for Busybox by Erik Andersen
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+//usage:#define fdformat_trivial_usage
+//usage:       "[-n] DEVICE"
+//usage:#define fdformat_full_usage "\n\n"
+//usage:       "Format floppy disk\n"
+//usage:     "\n       -n      Don't verify after format"
+
 #include "libbb.h"
 
 
@@ -40,13 +42,13 @@ struct format_descr {
        unsigned int device,head,track;
 };
 #define FDFMTBEG _IO(2,0x47)
-#define        FDFMTTRK _IOW(2,0x48, struct format_descr)
+#define FDFMTTRK _IOW(2,0x48, struct format_descr)
 #define FDFMTEND _IO(2,0x49)
 #define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
 #define FD_FILL_BYTE 0xF6 /* format fill byte. */
 
-int fdformat_main(int argc,char **argv);
-int fdformat_main(int argc,char **argv)
+int fdformat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fdformat_main(int argc UNUSED_PARAM, char **argv)
 {
        int fd, n, cyl, read_bytes, verify;
        unsigned char *data;
@@ -54,9 +56,7 @@ int fdformat_main(int argc,char **argv)
        struct floppy_struct param;
        struct format_descr descr;
 
-       if (argc < 2) {
-               bb_show_usage();
-       }
+       opt_complementary = "=1"; /* must have 1 param */
        verify = !getopt32(argv, "n");
        argv += optind;
 
@@ -116,7 +116,7 @@ int fdformat_main(int argc,char **argv)
                        /* Check backwards so we don't need a counter */
                        while (--read_bytes >= 0) {
                                if (data[read_bytes] != FD_FILL_BYTE) {
-                                        printf("bad data in cyl %d\nContinuing... ",cyl);
+                                        printf("bad data in cyl %d\nContinuing... ", cyl);
                                }
                        }
                }