Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/mkfs_minix.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/util-linux/mkfs_minix.c (modified) (23 diffs)

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

@@ -3 +3 @@
  * mkfs.c - make a linux (minix) file-system.
  *
- * (C) 1991 Linus Torvalds. This file may be redistributed as per
- * the Linux copyright.
+ * (C) 1991 Linus Torvalds.
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -68 +69 @@
 #include "minix.h"
 
-#define DEBUG 0
-
-/* If debugging, store the very same times/uids/gids for image consistency */
-#if DEBUG
+/* Store the very same times/uids/gids for image consistency */
+#if 1
 # define CUR_TIME 0
 # define GETUID 0
 # define GETGID 0
 #else
+/* Was using this. Is it useful? NB: this will break testsuite */
 # define CUR_TIME time(NULL)
 # define GETUID getuid()
@@ -90 +90 @@
 #endif
 
+enum { dev_fd = 3 };
+
 struct globals {
-    int dev_fd;
-
 #if ENABLE_FEATURE_MINIX2
     smallint version2;
@@ -110 +110 @@
     unsigned currently_testing;
 
-
     char root_block[BLOCK_SIZE];
-    char super_block_buffer[BLOCK_SIZE];
+    char superblock_buffer[BLOCK_SIZE];
     char boot_block_buffer[512];
     unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
     /* check_blocks(): buffer[] was the biggest static in entire bbox */
     char check_blocks_buffer[BLOCK_SIZE * TEST_BUFFER_BLOCKS];
+
+    unsigned short ind_block1[BLOCK_SIZE >> 1];
+    unsigned short dind_block1[BLOCK_SIZE >> 1];
+    unsigned long ind_block2[BLOCK_SIZE >> 2];
+    unsigned long dind_block2[BLOCK_SIZE >> 2];
 };
-
 #define G (*ptr_to_globals)
+#define INIT_G() do { \
+    SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
 
 static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
@@ -129 +135 @@
 #define INODE_BUF2              (((struct minix2_inode*)G.inode_buffer) - 1)
 
-#define SB                      (*(struct minix_super_block*)G.super_block_buffer)
+#define SB                      (*(struct minix_superblock*)G.superblock_buffer)
 
 #define SB_INODES               (SB.s_ninodes)
@@ -145 +151 @@
 # define SB_ZONES               (version2 ? SB.s_zones : SB.s_nzones)
 # define INODE_BLOCKS           div_roundup(SB_INODES, \
-                                version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK)
+                                (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK))
 #endif
 
@@ -156 +162 @@
 static int minix_bit(const char* a, unsigned i)
 {
-      return a[i >> 3] & (1<<(i & 7));
+    return a[i >> 3] & (1<<(i & 7));
 }
 
@@ -231 +237 @@
 static void write_tables(void)
 {
-    /* Mark the super block valid. */
+    /* Mark the superblock valid. */
     SB.s_state |= MINIX_VALID_FS;
     SB.s_state &= ~MINIX_ERROR_FS;
 
     msg_eol = "seek to 0 failed";
-    xlseek(G.dev_fd, 0, SEEK_SET);
-
-    msg_eol = "cannot clear boot sector";
-    xwrite(G.dev_fd, G.boot_block_buffer, 512);
+    xlseek(dev_fd, 0, SEEK_SET);
+
+    msg_eol = "can't clear boot sector";
+    xwrite(dev_fd, G.boot_block_buffer, 512);
 
     msg_eol = "seek to BLOCK_SIZE failed";
-    xlseek(G.dev_fd, BLOCK_SIZE, SEEK_SET);
-
-    msg_eol = "cannot write superblock";
-    xwrite(G.dev_fd, G.super_block_buffer, BLOCK_SIZE);
-
-    msg_eol = "cannot write inode map";
-    xwrite(G.dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE);
-
-    msg_eol = "cannot write zone map";
-    xwrite(G.dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE);
-
-    msg_eol = "cannot write inodes";
-    xwrite(G.dev_fd, G.inode_buffer, INODE_BUFFER_SIZE);
+    xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
+
+    msg_eol = "can't write superblock";
+    xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE);
+
+    msg_eol = "can't write inode map";
+    xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE);
+
+    msg_eol = "can't write zone map";
+    xwrite(dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE);
+
+    msg_eol = "can't write inodes";
+    xwrite(dev_fd, G.inode_buffer, INODE_BUFFER_SIZE);
 
     msg_eol = "\n";
@@ -261 +267 @@
 static void write_block(int blk, char *buffer)
 {
-    xlseek(G.dev_fd, blk * BLOCK_SIZE, SEEK_SET);
-    xwrite(G.dev_fd, buffer, BLOCK_SIZE);
+    xlseek(dev_fd, blk * BLOCK_SIZE, SEEK_SET);
+    xwrite(dev_fd, buffer, BLOCK_SIZE);
 }
 
@@ -307 +313 @@
     int i, j, zone;
     int ind = 0, dind = 0;
+    /* moved to globals to reduce stack usage
     unsigned short ind_block[BLOCK_SIZE >> 1];
     unsigned short dind_block[BLOCK_SIZE >> 1];
+    */
+#define ind_block (G.ind_block1)
+#define dind_block (G.dind_block1)
 
 #define NEXT_BAD (zone = next(zone))
@@ -352 +362 @@
     if (dind)
         write_block(dind, (char *) dind_block);
+#undef ind_block
+#undef dind_block
 }
 
@@ -360 +372 @@
     int i, j, zone;
     int ind = 0, dind = 0;
+    /* moved to globals to reduce stack usage
     unsigned long ind_block[BLOCK_SIZE >> 2];
     unsigned long dind_block[BLOCK_SIZE >> 2];
+    */
+#define ind_block (G.ind_block2)
+#define dind_block (G.dind_block2)
 
     if (!G.badblocks)
@@ -402 +418 @@
     if (dind)
         write_block(dind, (char *) dind_block);
+#undef ind_block
+#undef dind_block
 }
 #else
@@ -465 +483 @@
     /* Seek to the correct loc. */
     msg_eol = "seek failed during testing of blocks";
-    xlseek(G.dev_fd, current_block * BLOCK_SIZE, SEEK_SET);
+    xlseek(dev_fd, current_block * BLOCK_SIZE, SEEK_SET);
     msg_eol = "\n";
 
     /* Try the read */
-    got = read(G.dev_fd, buffer, try * BLOCK_SIZE);
+    got = read(dev_fd, buffer, try * BLOCK_SIZE);
     if (got < 0)
         got = 0;
@@ -479 +497 @@
 }
 
-static void alarm_intr(int alnum)
+static void alarm_intr(int alnum UNUSED_PARAM)
 {
     if (G.currently_testing >= SB_ZONES)
@@ -488 +506 @@
         return;
     printf("%d ...", G.currently_testing);
-    fflush(stdout);
+    fflush_all();
 }
 
@@ -500 +518 @@
     while (G.currently_testing < SB_ZONES) {
         msg_eol = "seek failed in check_blocks";
-        xlseek(G.dev_fd, G.currently_testing * BLOCK_SIZE, SEEK_SET);
+        xlseek(dev_fd, G.currently_testing * BLOCK_SIZE, SEEK_SET);
         msg_eol = "\n";
         try = TEST_BUFFER_BLOCKS;
@@ -524 +542 @@
     unsigned long blockno;
 
-    listfile = xfopen(filename, "r");
+    listfile = xfopen_for_read(filename);
     while (!feof(listfile)) {
         fscanf(listfile, "%ld\n", &blockno);
@@ -540 +558 @@
     unsigned i;
 
-    /* memset(G.super_block_buffer, 0, BLOCK_SIZE); */
+    /* memset(G.superblock_buffer, 0, BLOCK_SIZE); */
     /* memset(G.boot_block_buffer, 0, 512); */
     SB_MAGIC = G.magic;
@@ -604 +622 @@
 }
 
-int mkfs_minix_main(int argc, char **argv);
-int mkfs_minix_main(int argc, char **argv)
-{
-    struct mntent *mp;
+int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
+{
     unsigned opt;
     char *tmp;
     struct stat statbuf;
-    char *str_i, *str_n;
+    char *str_i;
     char *listfile = NULL;
 
-    PTR_TO_GLOBALS = xzalloc(sizeof(G));
+    INIT_G();
 /* default (changed to 30, per Linus's suggestion, Sun Nov 21 08:05:07 1993) */
     G.namelen = 30;
@@ -627 +644 @@
 #endif
 
-    opt = getopt32(argv, "ci:l:n:v", &str_i, &listfile, &str_n);
+    opt_complementary = "n+"; /* -n N */
+    opt = getopt32(argv, "ci:l:n:v", &str_i, &listfile, &G.namelen);
     argv += optind;
     //if (opt & 1) -c
@@ -633 +651 @@
     //if (opt & 4) -l
     if (opt & 8) { // -n
-        G.namelen = xatoi_u(str_n);
         if (G.namelen == 14) G.magic = MINIX1_SUPER_MAGIC;
         else if (G.namelen == 30) G.magic = MINIX1_SUPER_MAGIC2;
@@ -666 +683 @@
 
     /* Check if it is mounted */
-    mp = find_mount_point(G.device_name, NULL);
-    if (mp && strcmp(G.device_name, mp->mnt_fsname) == 0)
-        bb_error_msg_and_die("%s is mounted on %s; "
-                "refusing to make a filesystem",
-                G.device_name, mp->mnt_dir);
-
-    G.dev_fd = xopen(G.device_name, O_RDWR);
-    if (fstat(G.dev_fd, &statbuf) < 0)
-        bb_error_msg_and_die("cannot stat %s", G.device_name);
+    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);
+    xfstat(dev_fd, &statbuf, G.device_name);
     if (!S_ISBLK(statbuf.st_mode))
         opt &= ~1; // clear -c (check)