Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/blockdev.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/blockdev.c (modified) (10 diffs)

branches/3.2/mindi-busybox/util-linux/blockdev.c

@@ -7 +7 @@
  */
 
-//applet:IF_BLOCKDEV(APPLET(blockdev, _BB_DIR_SBIN, _BB_SUID_DROP))
+//applet:IF_BLOCKDEV(APPLET(blockdev, BB_DIR_SBIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_BLOCKDEV) += blockdev.o
@@ -20 +20 @@
 //usage:    "OPTION BLOCKDEV"
 //usage:#define blockdev_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n    --setro     Set ro"
+//usage:       "    --setro     Set ro"
 //usage:     "\n    --setrw     Set rw"
 //usage:     "\n    --getro     Get ro"
@@ -27 +26 @@
 //usage:     "\n    --getbsz    Get block size"
 //usage:     "\n    --setbsz BYTES  Set block size"
-//usage:     "\n    --getsize   Get device size in 512-byte sectors"
+//usage:     "\n    --getsz     Get device size in 512-byte sectors"
+/*//usage:     "\n  --getsize   Get device size in sectors (deprecated)"*/
 //usage:     "\n    --getsize64 Get device size in bytes"
 //usage:     "\n    --flushbufs Flush buffers"
@@ -35 +35 @@
 #include "libbb.h"
 #include <linux/fs.h>
-
-/*  Patch bco to compile this busybox on rhel3  */
-#ifndef BLKGETSIZE64
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
-#endif
 
 enum {
@@ -51 +46 @@
     FL_USRARG   = 4, /* argument is provided by user */
     FL_NORESULT = 8,
+    FL_SCALE512 = 16,
 };
 
@@ -91 +87 @@
         .flags = ARG_INT + FL_NORESULT + FL_USRARG,
         .argval = 0,
+    },{
+        .ioc = BLKGETSIZE64,
+        .name = "getsz",
+        .flags = ARG_U64 + FL_SCALE512,
+        .argval = -1,
     },{
         .ioc = BLKGETSIZE,
@@ -129 +130 @@
 
 int blockdev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int blockdev_main(int argc, char **argv)
+int blockdev_main(int argc UNUSED_PARAM, char **argv)
 {
     const struct bdc *bdcmd;
@@ -140 +141 @@
     } ioctl_val_on_stack;
 
-    if ((unsigned)(argc - 3) > 1) /* must have 2 or 3 args */
+    argv++;
+    if (!argv[0] || !argv[1]) /* must have at least 2 args */
         bb_show_usage();
 
-    bdcmd = find_cmd(*++argv);
+    bdcmd = find_cmd(*argv);
 
     u64 = (int)bdcmd->argval;
@@ -149 +151 @@
         u64 = xatoi_positive(*++argv);
 
-    if (!*++argv || argv[1])
+    argv++;
+    if (!argv[0] || argv[1])
         bb_show_usage();
-    fd = xopen(*argv, O_RDONLY);
+    fd = xopen(argv[0], O_RDONLY);
 
     ioctl_val_on_stack.u64 = u64;
@@ -179 +182 @@
     u64 = ioctl_val_on_stack.u64;
 
+    if (bdcmd->flags & FL_SCALE512)
+        u64 >>= 9;
+
     /* Zero- or one-extend the value if needed, then print */
     switch (bdcmd->flags & (ARG_MASK+FL_NORESULT)) {