diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fdisk.c | 11 | ||||
| -rw-r--r-- | util-linux/freeramdisk.c | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 6a194fd..c9f57c6 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -2821,7 +2821,7 @@ unknown_command(int c) #endif int fdisk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int fdisk_main(int argc, char **argv) +int fdisk_main(int argc UNUSED_PARAM, char **argv) { unsigned opt; /* @@ -2839,7 +2839,6 @@ int fdisk_main(int argc, char **argv) opt_complementary = "b+:C+:H+:S+"; /* numeric params */ opt = getopt32(argv, "b:C:H:lS:u" IF_FEATURE_FDISK_BLKSIZE("s"), §or_size, &user_cylinders, &user_heads, &user_sectors); - argc -= optind; argv += optind; if (opt & OPT_b) { // -b /* Ugly: this sector size is really per device, @@ -2883,14 +2882,14 @@ int fdisk_main(int argc, char **argv) int j; nowarn = 1; - if (argc <= 0) + if (!argv[0]) bb_show_usage(); - for (j = 0; j < argc; j++) { + for (j = 0; argv[j]; j++) { unsigned long long size; fd = xopen(argv[j], O_RDONLY); size = bb_BLKGETSIZE_sectors(fd) / 2; close(fd); - if (argc == 1) + if (argv[1]) printf("%llu\n", size); else printf("%s: %llu\n", argv[j], size); @@ -2900,7 +2899,7 @@ int fdisk_main(int argc, char **argv) #endif #if ENABLE_FEATURE_FDISK_WRITABLE - if (argc != 1) + if (!argv[0] || argv[1]) bb_show_usage(); disk_device = argv[0]; diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index 6b9d95e..4949056 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -15,16 +15,14 @@ #define FDFLUSH _IO(2,0x4b) int freeramdisk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int freeramdisk_main(int argc, char **argv) +int freeramdisk_main(int argc UNUSED_PARAM, char **argv) { int fd; - if (argc != 2) bb_show_usage(); - - fd = xopen(argv[1], O_RDWR); + fd = xopen(single_argv(argv), O_RDWR); // Act like freeramdisk, fdflush, or both depending on configuration. - ioctl_or_perror_and_die(fd, (ENABLE_FREERAMDISK && applet_name[1]=='r') + ioctl_or_perror_and_die(fd, (ENABLE_FREERAMDISK && applet_name[1] == 'r') || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH, NULL, "%s", argv[1]); if (ENABLE_FEATURE_CLEAN_UP) close(fd); |