blockdev: add --getsz to replace --getsize

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

diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 1441b92280a857add20c83abfe8ed04227943c14..57e9c26f8194e53d04ae0107fe6892362e87cb73 100644 (file)
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -1,15 +1,11 @@
 /* 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.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 
 /* Stuff extracted from linux/fd.h */
@@ -40,19 +36,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. */
 
-static void xioctl(int fd, int request, void *argp, const char *string)
-{
-       if (ioctl(fd, request, argp) < 0) {
-               bb_perror_msg_and_die(string);
-       }
-}
-
-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;
@@ -60,16 +50,11 @@ int fdformat_main(int argc,char **argv)
        struct floppy_struct param;
        struct format_descr descr;
 
-       if (argc < 2) {
-               bb_show_usage();
-       }
-       verify = !bb_getopt_ulflags(argc, argv, "n");
+       opt_complementary = "=1"; /* must have 1 param */
+       verify = !getopt32(argv, "n");
        argv += optind;
 
-       /* R_OK is needed for verifying */
-       if (stat(*argv, &st) < 0 || access(*argv, W_OK | R_OK ) < 0) {
-               bb_perror_msg_and_die("%s", *argv);
-       }
+       xstat(*argv, &st);
        if (!S_ISBLK(st.st_mode)) {
                bb_error_msg_and_die("%s: not a block device", *argv);
                /* do not test major - perhaps this was an USB floppy */
@@ -78,29 +63,30 @@ int fdformat_main(int argc,char **argv)
        /* O_RDWR for formatting and verifying */
        fd = xopen(*argv, O_RDWR);
 
-       xioctl(fd, FDGETPRM, &param, "FDGETPRM");/*original message was: "Could not determine current format type" */
+       /* original message was: "Could not determine current format type" */
+       xioctl(fd, FDGETPRM, &param);
 
-       printf("%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n",
+       printf("%s-sided, %d tracks, %d sec/track. Total capacity %d kB\n",
                (param.head == 2) ? "Double" : "Single",
                param.track, param.sect, param.size >> 1);
 
        /* FORMAT */
        printf("Formatting... ");
-       xioctl(fd, FDFMTBEG, NULL, "FDFMTBEG");
+       xioctl(fd, FDFMTBEG, NULL);
 
        /* n == track */
        for (n = 0; n < param.track; n++) {
                descr.head = 0;
                descr.track = n;
-               xioctl(fd, FDFMTTRK, &descr, "FDFMTTRK");
+               xioctl(fd, FDFMTTRK, &descr);
                printf("%3d\b\b\b", n);
                if (param.head == 2) {
                        descr.head = 1;
-                       xioctl(fd, FDFMTTRK, &descr, "FDFMTTRK");
+                       xioctl(fd, FDFMTTRK, &descr);
                }
        }
 
-       xioctl(fd, FDFMTEND, NULL, "FDFMTEND");
+       xioctl(fd, FDFMTEND, NULL);
        printf("done\n");
 
        /* VERIFY */
@@ -117,13 +103,14 @@ int fdformat_main(int argc,char **argv)
                                if (read_bytes < 0) {
                                        bb_perror_msg(bb_msg_read_error);
                                }
-                               bb_error_msg_and_die("problem reading cylinder %d, expected %d, read %d", cyl, n, read_bytes);
+                               bb_error_msg_and_die("problem reading cylinder %d, "
+                                       "expected %d, read %d", cyl, n, read_bytes);
                                // FIXME: maybe better seek & continue??
                        }
                        /* 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);
                                }
                        }
                }