diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 19:57:50 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 19:57:50 +0000 |
| commit | b6332248ca4d781b4142fb9b6fe7e97a4a9ad59d (patch) | |
| tree | d38d7aeeae4940732ce09c34bb7057fad4bc8f04 | |
| parent | 9275814a9e6a3af390c932238c0b1130de8d0edd (diff) | |
| download | busybox-b6332248ca4d781b4142fb9b6fe7e97a4a9ad59d.tar.gz | |
fdformat: remove redundant check
| -rw-r--r-- | libbb/xfuncs.c | 2 | ||||
| -rw-r--r-- | util-linux/fdformat.c | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 7b95e49f1..4aa1c3000 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -498,7 +498,7 @@ void xlisten(int s, int backlog) void xstat(char *name, struct stat *stat_buf) { if (stat(name, stat_buf)) - bb_perror_msg_and_die("Can't stat '%s'", name); + bb_perror_msg_and_die("can't stat '%s'", name); } #endif diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c index 1441b9228..9b97e6873 100644 --- a/util-linux/fdformat.c +++ b/util-linux/fdformat.c @@ -66,10 +66,7 @@ int fdformat_main(int argc,char **argv) verify = !bb_getopt_ulflags(argc, 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,9 +75,10 @@ int fdformat_main(int argc,char **argv) /* O_RDWR for formatting and verifying */ fd = xopen(*argv, O_RDWR); - xioctl(fd, FDGETPRM, ¶m, "FDGETPRM");/*original message was: "Could not determine current format type" */ + /* original message was: "Could not determine current format type" */ + xioctl(fd, FDGETPRM, ¶m, "FDGETPRM"); - 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); @@ -117,7 +115,8 @@ 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 */ |