b6332248c
Denis Vlasenko
2006-10-03
Subject
fdformat: remove redundant check
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/xfuncs.c+1 -1
| @@ -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 | |
util-linux/fdformat.c+6 -7
| @@ -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 */ | |