X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Ffdformat.c;h=3831ab44e1474e89154275d8dd25e79c9f7d8dc0;hb=765b0eed3ef29a80115708c3249d3a541509cd24;hp=5b926467f915fc172fa175c27236bb574503d4ed;hpb=01c3d40f3c022abc08c14b96fe586a33fce081e8;p=oweals%2Fbusybox.git diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c index 5b926467f..3831ab44e 100644 --- a/util-linux/fdformat.c +++ b/util-linux/fdformat.c @@ -1,22 +1,11 @@ -/* fdformat.c - Low-level formats a floppy disk - Werner Almesberger */ - -/* 1999-02-22 Arkadiusz Mi¶kiewicz - * - added Native Language Support - * 1999-03-20 Arnaldo Carvalho de Melo - * - more i18n/nls translatable strings marked - * +/* vi: set sw=4 ts=4: */ +/* 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 tarball for details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" /* Stuff extracted from linux/fd.h */ @@ -52,107 +41,91 @@ struct format_descr { #define FDGETPRM _IOR(2, 0x04, struct floppy_struct) #define FD_FILL_BYTE 0xF6 /* format fill byte. */ - - -static void format_disk(int ctrl, char *name, struct floppy_struct *param) +int fdformat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int fdformat_main(int argc UNUSED_PARAM, char **argv) { - struct format_descr descr; - int track; - - printf("Formatting ... "); - fflush(stdout); - if (ioctl(ctrl,FDFMTBEG,NULL) < 0) { - bb_perror_msg_and_die("FDFMTBEG"); - } - for (track = 0; track < param->track; track++) - { - descr.track = track; - descr.head = 0; - if (ioctl(ctrl,FDFMTTRK,(long) &descr) < 0) { - bb_perror_msg_and_die("FDFMTTRK"); + int fd, n, cyl, read_bytes, verify; + unsigned char *data; + struct stat st; + struct floppy_struct param; + struct format_descr descr; + + opt_complementary = "=1"; /* must have 1 param */ + verify = !getopt32(argv, "n"); + argv += optind; + + 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 */ } - printf("%3d\b\b\b",track); - fflush(stdout); - if (param->head == 2) { - descr.head = 1; - if (ioctl(ctrl,FDFMTTRK,(long) &descr) < 0) { - bb_perror_msg_and_die("FDFMTTRK"); - } + /* O_RDWR for formatting and verifying */ + fd = xopen(*argv, O_RDWR); + + /* original message was: "Could not determine current format type" */ + xioctl(fd, FDGETPRM, ¶m); + + 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); + + /* n == track */ + for (n = 0; n < param.track; n++) { + descr.head = 0; + descr.track = n; + xioctl(fd, FDFMTTRK, &descr); + printf("%3d\b\b\b", n); + if (param.head == 2) { + descr.head = 1; + xioctl(fd, FDFMTTRK, &descr); + } } - } - if (ioctl(ctrl,FDFMTEND,NULL) < 0) { - bb_perror_msg_and_die("FDFMTEND"); - } - printf("done\n"); -} -static void verify_disk(char *name, struct floppy_struct *param) -{ - unsigned char *data; - int fd,cyl_size,cyl,count,read_bytes; - - cyl_size = param->sect*param->head*512; - data = xmalloc(cyl_size); - printf("Verifying ... "); - fflush(stdout); - fd = bb_xopen(name,O_RDONLY); - for (cyl = 0; cyl < param->track; cyl++) - { - printf("%3d\b\b\b",cyl); - fflush(stdout); - read_bytes = safe_read(fd,data,cyl_size); - if(read_bytes != cyl_size) { - if(read_bytes < 0) { - bb_perror_msg("Read: "); - } - bb_error_msg_and_die("Problem reading cylinder %d, " - "expected %d, read %d", cyl, cyl_size, read_bytes); + xioctl(fd, FDFMTEND, NULL); + printf("done\n"); + + /* VERIFY */ + if (verify) { + /* n == cyl_size */ + n = param.sect*param.head*512; + + data = xmalloc(n); + printf("Verifying... "); + for (cyl = 0; cyl < param.track; cyl++) { + printf("%3d\b\b\b", cyl); + read_bytes = safe_read(fd, data, n); + if (read_bytes != n) { + 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); + // 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); + } + } + } + /* There is no point in freeing blocks at the end of a program, because + all of the program's space is given back to the system when the process + terminates.*/ + + if (ENABLE_FEATURE_CLEAN_UP) free(data); + + printf("done\n"); } - for (count = 0; count < cyl_size; count++) - if (data[count] != FD_FILL_BYTE) { - printf("bad data in cyl %d\nContinuing ... ",cyl); - fflush(stdout); - break; - } - } - printf("done\n"); - close(fd); -} -int fdformat_main(int argc,char **argv) -{ - int ctrl; - int verify; - struct stat st; - struct floppy_struct param; - - if (argc < 2) { - bb_show_usage(); - } - verify != bb_getopt_ulflags(argc, argv, "n"); - argv += optind; - - if (stat(*argv,&st) < 0 || access(*argv,W_OK) < 0) { - bb_perror_msg_and_die(*argv); - } - 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 */ - } - - ctrl = bb_xopen(*argv,O_WRONLY); - if (ioctl(ctrl,FDGETPRM,(long) ¶m) < 0) { - bb_perror_msg_and_die("Could not determine current format type"); - } - 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_disk(ctrl, *argv, ¶m); - close(ctrl); - - if (verify) { - verify_disk(*argv, ¶m); - } - return EXIT_SUCCESS; + if (ENABLE_FEATURE_CLEAN_UP) close(fd); + + /* Don't bother closing. Exit does + * that, so we can save a few bytes */ + return EXIT_SUCCESS; }