Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/e2fsprogs/chattr.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/e2fsprogs/chattr.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/e2fsprogs/chattr.c

@@ -38 +38 @@
 static unsigned long get_flag(char c)
 {
-    /* Two separate vectors take less space than vector of structs */
-    static const char flags_letter[] ALIGN1 = "ASDacdijsutT";
-    static const unsigned long flags_val[] = {
-        /* A */ EXT2_NOATIME_FL,
-        /* S */ EXT2_SYNC_FL,
-        /* D */ EXT2_DIRSYNC_FL,
-        /* a */ EXT2_APPEND_FL,
-        /* c */ EXT2_COMPR_FL,
-        /* d */ EXT2_NODUMP_FL,
-        /* i */ EXT2_IMMUTABLE_FL,
-        /* j */ EXT3_JOURNAL_DATA_FL,
-        /* s */ EXT2_SECRM_FL,
-        /* u */ EXT2_UNRM_FL,
-        /* t */ EXT2_NOTAIL_FL,
-        /* T */ EXT2_TOPDIR_FL,
-    };
-    const char *fp;
-
-    for (fp = flags_letter; *fp; fp++)
-        if (*fp == c)
-            return flags_val[fp - flags_letter];
+    const char *fp = strchr(e2attr_flags_sname_chattr, c);
+    if (fp)
+        return e2attr_flags_value_chattr[fp - e2attr_flags_sname_chattr];
     bb_show_usage();
 }
@@ -86 +68 @@
 static void change_attributes(const char *name, struct globals *gp);
 
-static int chattr_dir_proc(const char *dir_name, struct dirent *de, void *gp)
+static int FAST_FUNC chattr_dir_proc(const char *dir_name, struct dirent *de, void *gp)
 {
     char *path = concat_subpath_file(dir_name, de->d_name);
@@ -143 +125 @@
 }
 
-int chattr_main(int argc, char **argv);
-int chattr_main(int argc, char **argv)
+int chattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chattr_main(int argc UNUSED_PARAM, char **argv)
 {
     struct globals g;