Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs

Timestamp:

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

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs

Files:

• blkid/blkid_getsize.c (modified) (1 diff)
• blkid/probe.c (modified) (2 diffs)
• e2fsck.c (modified) (5 diffs)
• e2fsck.h (modified) (1 diff)
• e2p/feature.c (modified) (1 diff)
• ext2fs/ext2_fs.h (modified) (1 diff)
• ext2fs/ext2fs.h (modified) (1 diff)
• ext2fs/ext2fs_inline.c (modified) (1 diff)
• ext2fs/get_pathname.c (modified) (1 diff)
• ext2fs/getsize.c (modified) (1 diff)
• ext2fs/initialize.c (modified) (1 diff)
• lsattr.c (modified) (1 diff)
• mke2fs.c (modified) (4 diffs)

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/blkid_getsize.c

@@ -97 +97 @@
 #ifdef BLKGETSIZE64
 #ifdef __linux__
-    if ((uname(&ut) == 0) &&
-        ((ut.release[0] == '2') && (ut.release[1] == '.') &&
-         (ut.release[2] < '6') && (ut.release[3] == '.')))
+    uname(&ut);
+    if ((ut.release[0] == '2') && (ut.release[1] == '.') &&
+         (ut.release[2] < '6') && (ut.release[3] == '.'))
         valid_blkgetsize64 = 0;
 #endif

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c

@@ -576 +576 @@
            dev->bid_name, diff));
 
-    if (((fd = open(dev->bid_name, O_RDONLY)) < 0) ||
-        (fstat(fd, &st) < 0)) {
+    fd = open(dev->bid_name, O_RDONLY);
+    if (fd < 0
+     || fstat(fd, &st) < 0
+    ) {
+        if (fd >= 0)
+            close(fd);
         if (errno == ENXIO || errno == ENODEV || errno == ENOENT) {
             blkid_free_dev(dev);
@@ -654 +658 @@
     if (!dev->bid_type) {
         blkid_free_dev(dev);
+        close(fd);
         return NULL;
     }

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/e2fsck.c

@@ -29 +29 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+/*
+//usage:#define e2fsck_trivial_usage
+//usage:       "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] "
+//usage:       "[-I inode_buffer_blocks] [-P process_inode_size] "
+//usage:       "[-l|-L bad_blocks_file] [-C fd] [-j external_journal] "
+//usage:       "[-E extended-options] device"
+//usage:#define e2fsck_full_usage "\n\n"
+//usage:       "Check ext2/ext3 file system\n"
+//usage:     "\n    -p      Automatic repair (no questions)"
+//usage:     "\n    -n      Make no changes to the filesystem"
+//usage:     "\n    -y      Assume 'yes' to all questions"
+//usage:     "\n    -c      Check for bad blocks and add them to the badblock list"
+//usage:     "\n    -f      Force checking even if filesystem is marked clean"
+//usage:     "\n    -v      Verbose"
+//usage:     "\n    -b superblock   Use alternative superblock"
+//usage:     "\n    -B blocksize    Force blocksize when looking for superblock"
+//usage:     "\n    -j journal  Set location of the external journal"
+//usage:     "\n    -l file     Add to badblocks list"
+//usage:     "\n    -L file     Set badblocks list"
+*/
 
 #include "e2fsck.h" /*Put all of our defines here to clean things up*/
@@ -561 +582 @@
 /*
  * Return the given node's successor node---the node which has the
- * next key in the the left to right ordering. If the node has
+ * next key in the left to right ordering. If the node has
  * no successor, a null pointer is returned rather than a pointer to
  * the nil node.
@@ -11557 +11578 @@
      */
     if (!(fs->super->s_feature_compat &
-          EXT2_FEATURE_COMPAT_RESIZE_INODE)) {
+          EXT2_FEATURE_COMPAT_RESIZE_INO)) {
         if (fs->super->s_reserved_gdt_blocks) {
             pctx.num = fs->super->s_reserved_gdt_blocks;
@@ -11573 +11594 @@
     if (retval) {
         if (fs->super->s_feature_compat &
-            EXT2_FEATURE_COMPAT_RESIZE_INODE)
+            EXT2_FEATURE_COMPAT_RESIZE_INO)
             ctx->flags |= E2F_FLAG_RESIZE_INODE;
         return;
@@ -11583 +11604 @@
      */
     if (!(fs->super->s_feature_compat &
-          EXT2_FEATURE_COMPAT_RESIZE_INODE)) {
+          EXT2_FEATURE_COMPAT_RESIZE_INO)) {
         for (i=0; i < EXT2_N_BLOCKS; i++) {
             if (inode.i_block[i])

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/e2fsck.h

@@ -259 +259 @@
 #define PR_1_SET_IMMUTABLE            0x010030  /* Immutable flag set on a device or socket inode */
 #define PR_1_COMPR_SET                0x010031  /* Compression flag set on a non-compressed filesystem */
-#define PR_1_SET_NONZSIZE             0x010032  /* Non-zero size on on device, fifo or socket inode */
+#define PR_1_SET_NONZSIZE             0x010032  /* Non-zero size on device, fifo or socket inode */
 #define PR_1_FS_REV_LEVEL             0x010033  /* Filesystem revision is 0, but feature flags are set */
 #define PR_1_JOURNAL_INODE_NOT_CLEAR  0x010034  /* Journal inode not in use, needs clearing */

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/e2p/feature.c

@@ -35 +35 @@
     {   E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_INDEX,
             "dir_index" },
-    {   E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_RESIZE_INODE,
+    {   E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_RESIZE_INO,
             "resize_inode" },
     {   E2P_FEATURE_RO_INCOMPAT, EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER,

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h

@@ -476 +476 @@
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL     0x0004
 #define EXT2_FEATURE_COMPAT_EXT_ATTR        0x0008
-#define EXT2_FEATURE_COMPAT_RESIZE_INODE    0x0010
+#define EXT2_FEATURE_COMPAT_RESIZE_INO      0x0010
 #define EXT2_FEATURE_COMPAT_DIR_INDEX       0x0020
 

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h

@@ -384 +384 @@
                      EXT2_FEATURE_COMPAT_IMAGIC_INODES|\
                      EXT3_FEATURE_COMPAT_HAS_JOURNAL|\
-                     EXT2_FEATURE_COMPAT_RESIZE_INODE|\
+                     EXT2_FEATURE_COMPAT_RESIZE_INO|\
                      EXT2_FEATURE_COMPAT_DIR_INDEX|\
                      EXT2_FEATURE_COMPAT_EXT_ATTR)

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c

@@ -156 +156 @@
                     struct ext2_inode *inode)
 {
-       return inode->i_blocks -
-          (inode->i_file_acl ? fs->blocksize >> 9 : 0);
+    return inode->i_blocks -
+        (inode->i_file_acl ? fs->blocksize >> 9 : 0);
 }
 

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c

@@ -16 +16 @@
  *  directory inode, and <ino> is the inode number itself.  If
  *  <ino> is zero, then ext2fs_get_pathname will return pathname
- *  of the the directory <dir>.
+ *  of the directory <dir>.
  *
  */

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/getsize.c

@@ -175 +175 @@
 #ifdef BLKGETSIZE64
 #ifdef __linux__
-    if ((uname(&ut) == 0) &&
-        ((ut.release[0] == '2') && (ut.release[1] == '.') &&
-         (ut.release[2] < '6') && (ut.release[3] == '.')))
+    uname(&ut);
+    if ((ut.release[0] == '2') && (ut.release[1] == '.') &&
+         (ut.release[2] < '6') && (ut.release[3] == '.'))
         valid_blkgetsize64 = 0;
 #endif

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c

@@ -285 +285 @@
      * check the number of reserved group descriptor table blocks
      */
-    if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)
+    if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO)
         rsv_gdt = calc_reserved_gdt_blocks(fs);
     else

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/lsattr.c

@@ -94 +94 @@
 
     if (lstat(path, &st) == -1)
-        bb_perror_msg(path);
+        bb_simple_perror_msg(path);
     else {
         if (de->d_name[0] != '.' || (flags & OPT_ALL)) {

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/mke2fs.c

@@ -758 +758 @@
             if (rsv_gdb > 0) {
                 sb_param->s_feature_compat |=
-                    EXT2_FEATURE_COMPAT_RESIZE_INODE;
+                    EXT2_FEATURE_COMPAT_RESIZE_INO;
 
                 sb_param->s_reserved_gdt_blocks = rsv_gdb;
@@ -779 +779 @@
 static __u32 ok_features[3] = {
     EXT3_FEATURE_COMPAT_HAS_JOURNAL |
-        EXT2_FEATURE_COMPAT_RESIZE_INODE |
+        EXT2_FEATURE_COMPAT_RESIZE_INO |
         EXT2_FEATURE_COMPAT_DIR_INDEX,  /* Compat */
     EXT2_FEATURE_INCOMPAT_FILETYPE|         /* Incompat */
@@ -1124 +1124 @@
      * here if it was explicitly disabled.
      */
-    if ((param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
+    if ((param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO) &&
         !(param.s_feature_ro_compat&EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
         bb_error_msg_and_die("reserved online resize blocks not supported "
@@ -1313 +1313 @@
         create_bad_block_inode(fs, bb_list);
         if (fs->super->s_feature_compat &
-            EXT2_FEATURE_COMPAT_RESIZE_INODE) {
+            EXT2_FEATURE_COMPAT_RESIZE_INO) {
             retval = ext2fs_create_resize_inode(fs);
             mke2fs_error_msg_and_die(retval, "reserve blocks for online resize");