Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/mkfs_minix.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/mkfs_minix.c (modified) (7 diffs)

branches/3.3/mindi-busybox/util-linux/mkfs_minix.c

@@ -196 +196 @@
 # define BLKGETSIZE     _IO(0x12,96)    /* return device size */
 #endif
-
-
-static long valid_offset(int fd, int offset)
-{
-    char ch;
-
-    if (lseek(fd, offset, SEEK_SET) < 0)
-        return 0;
-    if (read(fd, &ch, 1) < 1)
-        return 0;
-    return 1;
-}
-
-static int count_blocks(int fd)
-{
-    int high, low;
-
-    low = 0;
-    for (high = 1; valid_offset(fd, high); high *= 2)
-        low = high;
-
-    while (low < high - 1) {
-        const int mid = (low + high) / 2;
-
-        if (valid_offset(fd, mid))
-            low = mid;
-        else
-            high = mid;
-    }
-    valid_offset(fd, 0);
-    return (low + 1);
-}
-
-static int get_size(const char *file)
-{
-    int fd;
-    long size;
-
-    fd = xopen(file, O_RDWR);
-    if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
-        close(fd);
-        return (size * 512);
-    }
-
-    size = count_blocks(fd);
-    close(fd);
-    return size;
-}
 
 static void write_tables(void)
@@ -554 +506 @@
     listfile = xfopen_for_read(filename);
     while (!feof(listfile)) {
-        fscanf(listfile, "%ld\n", &blockno);
+        fscanf(listfile, "%lu\n", &blockno);
         mark_zone(blockno);
         G.badblocks++;
@@ -625 +577 @@
         unmark_inode(i);
     G.inode_buffer = xzalloc(INODE_BUFFER_SIZE);
-    printf("%ld inodes\n", (long)SB_INODES);
-    printf("%ld blocks\n", (long)SB_ZONES);
-    printf("Firstdatazone=%ld (%ld)\n", (long)SB_FIRSTZONE, (long)norm_firstzone);
-    printf("Zonesize=%d\n", BLOCK_SIZE << SB_ZONE_SIZE);
-    printf("Maxsize=%ld\n", (long)SB_MAXSIZE);
+    printf("%lu inodes\n", (unsigned long)SB_INODES);
+    printf("%lu blocks\n", (unsigned long)SB_ZONES);
+    printf("Firstdatazone=%lu (%lu)\n", (unsigned long)SB_FIRSTZONE, (unsigned long)norm_firstzone);
+    printf("Zonesize=%u\n", BLOCK_SIZE << SB_ZONE_SIZE);
+    printf("Maxsize=%lu\n", (unsigned long)SB_MAXSIZE);
 }
 
@@ -637 +589 @@
     unsigned opt;
     char *tmp;
-    struct stat statbuf;
     char *str_i;
     char *listfile = NULL;
@@ -674 +625 @@
     }
 
-    G.device_name = *argv++;
+    G.device_name = argv[0];
     if (!G.device_name)
         bb_show_usage();
-    if (*argv)
-        G.total_blocks = xatou32(*argv);
-    else
-        G.total_blocks = get_size(G.device_name) / 1024;
+
+    /* Check if it is mounted */
+    if (find_mount_point(G.device_name, 0))
+        bb_error_msg_and_die("can't format mounted filesystem");
+
+    xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
+
+    G.total_blocks = get_volume_size_in_bytes(dev_fd, argv[1], 1024, /*extend:*/ 1) / 1024;
 
     if (G.total_blocks < 10)
@@ -691 +646 @@
     } else if (G.total_blocks > 65535)
         G.total_blocks = 65535;
-
-    /* Check if it is mounted */
-    if (find_mount_point(G.device_name, 0))
-        bb_error_msg_and_die("can't format mounted filesystem");
-
-    xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
+#if 0
+    struct stat statbuf;
     xfstat(dev_fd, &statbuf, G.device_name);
+/* why? */
     if (!S_ISBLK(statbuf.st_mode))
         opt &= ~1; // clear -c (check)
-
+#if 0
 /* I don't know why someone has special code to prevent mkfs.minix
  * on IDE devices. Why IDE but not SCSI, etc?... */
-#if 0
     else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
         /* what is this? */
@@ -709 +660 @@
             "to make filesystem on '%s'", G.device_name);
 #endif
-
+#endif
     tmp = G.root_block;
     *(short *) tmp = 1;