diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/Kbuild | 1 | ||||
| -rw-r--r-- | util-linux/mkfs_ext2.c | 7 | ||||
| -rw-r--r-- | util-linux/mkfs_reiser.c | 7 | ||||
| -rw-r--r-- | util-linux/mkfs_vfat.c | 7 | ||||
| -rw-r--r-- | util-linux/tune2fs.c | 71 |
5 files changed, 9 insertions, 84 deletions
diff --git a/util-linux/Kbuild b/util-linux/Kbuild index 99e3efe..4fa3923 100644 --- a/util-linux/Kbuild +++ b/util-linux/Kbuild @@ -42,5 +42,4 @@ lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o lib-$(CONFIG_SETARCH) += setarch.o lib-$(CONFIG_SWAPONOFF) += swaponoff.o lib-$(CONFIG_SWITCH_ROOT) += switch_root.o -lib-$(CONFIG_MKFS_EXT2) += tune2fs.o lib-$(CONFIG_UMOUNT) += umount.o diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index cf40c20..fd54734 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -10,7 +10,6 @@ #include "libbb.h" #include <linux/fs.h> #include <linux/ext2_fs.h> -#include "volume_id/volume_id_internal.h" #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0 #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1 @@ -29,9 +28,9 @@ char BUG_wrong_field_size(void); #define STORE_LE(field, value) \ do { \ if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ + field = SWAP_LE32(value); \ else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ + field = SWAP_LE16(value); \ else if (sizeof(field) == 1) \ field = (value); \ else \ @@ -39,7 +38,7 @@ do { \ } while (0) #define FETCH_LE32(field) \ - (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) + (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) // All fields are little-endian struct ext2_dir { diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c index eb2c94d..f9a0ca8 100644 --- a/util-linux/mkfs_reiser.c +++ b/util-linux/mkfs_reiser.c @@ -8,15 +8,14 @@ */ #include "libbb.h" #include <linux/fs.h> -#include "volume_id/volume_id_internal.h" char BUG_wrong_field_size(void); #define STORE_LE(field, value) \ do { \ if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ + field = SWAP_LE32(value); \ else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ + field = SWAP_LE16(value); \ else if (sizeof(field) == 1) \ field = (value); \ else \ @@ -24,7 +23,7 @@ do { \ } while (0) #define FETCH_LE32(field) \ - (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) + (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) struct journal_params { uint32_t jp_journal_1st_block; /* where does journal start from on its device */ diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index 1363612..ff3e416 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c @@ -16,7 +16,6 @@ # define BLKSSZGET _IO(0x12, 104) #endif //#include <linux/msdos_fs.h> -#include "volume_id/volume_id_internal.h" #define SECTOR_SIZE 512 @@ -168,15 +167,15 @@ static const char boot_code[] ALIGN1 = #define MARK_CLUSTER(cluster, value) \ - ((uint32_t *)fat)[cluster] = cpu_to_le32(value) + ((uint32_t *)fat)[cluster] = SWAP_LE32(value) void BUG_unsupported_field_size(void); #define STORE_LE(field, value) \ do { \ if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ + field = SWAP_LE32(value); \ else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ + field = SWAP_LE16(value); \ else if (sizeof(field) == 1) \ field = (value); \ else \ diff --git a/util-linux/tune2fs.c b/util-linux/tune2fs.c deleted file mode 100644 index 3b8f3d8..0000000 --- a/util-linux/tune2fs.c +++ /dev/null @@ -1,71 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * tune2fs: utility to modify EXT2 filesystem - * - * Busybox'ed (2009) by Vladimir Dronnikov <dronnikov@gmail.com> - * - * Licensed under GPLv2, see file LICENSE in this tarball for details. - */ -#include "libbb.h" -#include <linux/fs.h> -#include <linux/ext2_fs.h> -#include "volume_id/volume_id_internal.h" - -// storage helpers -char BUG_wrong_field_size(void); -#define STORE_LE(field, value) \ -do { \ - if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ - else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ - else if (sizeof(field) == 1) \ - field = (value); \ - else \ - BUG_wrong_field_size(); \ -} while (0) - -#define FETCH_LE32(field) \ - (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) - -enum { - OPT_L = 1 << 0, // label -}; - -int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int tune2fs_main(int argc UNUSED_PARAM, char **argv) -{ - unsigned opts; - const char *label; - struct ext2_super_block *sb; - int fd; - - opt_complementary = "=1"; - opts = getopt32(argv, "L:", &label); - argv += optind; // argv[0] -- device - - if (!opts) - bb_show_usage(); - - // read superblock - fd = xopen(argv[0], O_RDWR); - xlseek(fd, 1024, SEEK_SET); - sb = xzalloc(1024); - xread(fd, sb, 1024); - - // mangle superblock - //STORE_LE(sb->s_wtime, time(NULL)); - why bother? - // set the label - if (1 /*opts & OPT_L*/) - safe_strncpy((char *)sb->s_volume_name, label, sizeof(sb->s_volume_name)); - // write superblock - xlseek(fd, 1024, SEEK_SET); - xwrite(fd, sb, 1024); - - if (ENABLE_FEATURE_CLEAN_UP) { - free(sb); - } - - xclose(fd); - return EXIT_SUCCESS; -} |