const char * program_name = "dumpe2fs";
char * device_name = NULL;
const char *num_format = "%lu";
+char range_format[16];
static void usage(void)
{
exit (1);
}
+static void print_number (unsigned long num)
+{
+ printf(num_format, num);
+}
+
static void print_free (unsigned long group, char * bitmap,
unsigned long nbytes, unsigned long offset)
{
{
if (p)
printf (", ");
- printf (num_format, i + offset);
+ print_number(i + offset);
for (j = i; j < nbytes && !in_use (bitmap, j); j++)
;
if (--j != i) {
fputc('-', stdout);
- printf(num_format, j + offset);
+ print_number(j + offset);
i = j;
}
p = 1;
unsigned long i;
long diff;
blk_t group_blk, next_blk;
- char * block_bitmap = fs->block_map->bitmap;
- char * inode_bitmap = fs->inode_map->bitmap;
- int inode_blocks_per_group;
- int group_desc_blocks;
+ blk_t super_blk, old_desc_blk, new_desc_blk;
+ char *block_bitmap=NULL, *inode_bitmap=NULL;
+ int inode_blocks_per_group, old_desc_blocks, reserved_gdt;
+ int has_super;
+
+ if (fs->block_map)
+ block_bitmap = fs->block_map->bitmap;
+ if (fs->inode_map)
+ inode_bitmap = fs->inode_map->bitmap;
inode_blocks_per_group = ((fs->super->s_inodes_per_group *
EXT2_INODE_SIZE(fs->super)) +
EXT2_BLOCK_SIZE(fs->super) - 1) /
EXT2_BLOCK_SIZE(fs->super);
- group_desc_blocks = ((fs->super->s_blocks_count -
- fs->super->s_first_data_block +
- EXT2_BLOCKS_PER_GROUP(fs->super) - 1) /
- EXT2_BLOCKS_PER_GROUP(fs->super) +
- EXT2_DESC_PER_BLOCK(fs->super) - 1) /
- EXT2_DESC_PER_BLOCK(fs->super);
-
+ reserved_gdt = fs->super->s_reserved_gdt_blocks;
fputc('\n', stdout);
group_blk = fs->super->s_first_data_block;
+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+ old_desc_blocks = fs->super->s_first_meta_bg;
+ else
+ old_desc_blocks = fs->desc_blocks;
for (i = 0; i < fs->group_desc_count; i++) {
+ ext2fs_super_and_bgd_loc(fs, i, &super_blk,
+ &old_desc_blk, &new_desc_blk, 0);
next_blk = group_blk + fs->super->s_blocks_per_group;
if (next_blk > fs->super->s_blocks_count)
next_blk = fs->super->s_blocks_count;
printf (_("Group %lu: (Blocks "), i);
- printf(num_format, group_blk);
- fputc('-', stdout);
- printf(num_format, next_blk - 1);
+ printf(range_format, group_blk, next_blk - 1);
fputs(")\n", stdout);
- if (ext2fs_bg_has_super (fs, i)) {
- printf (_(" %s Superblock at "),
+ has_super = ((i==0) || super_blk);
+ if (has_super) {
+ printf (_(" %s superblock at "),
i == 0 ? _("Primary") : _("Backup"));
- printf(num_format, group_blk);
- printf(_(", Group Descriptors at "));
- printf(num_format, group_blk+1);
- fputc('-', stdout);
- printf(num_format, group_blk + group_desc_blocks);
- fputc('\n', stdout);
+ print_number(super_blk);
+ }
+ if (old_desc_blk) {
+ printf(_(", Group descriptors at "));
+ printf(range_format, old_desc_blk,
+ old_desc_blk + old_desc_blocks - 1);
+ if (reserved_gdt) {
+ printf(_("\n Reserved GDT blocks at "));
+ printf(range_format,
+ old_desc_blk + old_desc_blocks,
+ old_desc_blk + old_desc_blocks +
+ reserved_gdt - 1);
+ }
+ } else if (new_desc_blk) {
+ fputc(has_super ? ',' : ' ', stdout);
+ printf(_(" Group descriptor at "));
+ print_number(new_desc_blk);
+ has_super++;
}
+ if (has_super)
+ fputc('\n', stdout);
fputs(_(" Block bitmap at "), stdout);
- printf(num_format, fs->group_desc[i].bg_block_bitmap);
+ print_number(fs->group_desc[i].bg_block_bitmap);
diff = fs->group_desc[i].bg_block_bitmap - group_blk;
if (diff >= 0)
printf(" (+%ld)", diff);
fputs(_(", Inode bitmap at "), stdout);
- printf(num_format, fs->group_desc[i].bg_inode_bitmap);
+ print_number(fs->group_desc[i].bg_inode_bitmap);
diff = fs->group_desc[i].bg_inode_bitmap - group_blk;
if (diff >= 0)
printf(" (+%ld)", diff);
fputs(_("\n Inode table at "), stdout);
- printf(num_format, fs->group_desc[i].bg_inode_table);
- fputc('-', stdout);
- printf(num_format, fs->group_desc[i].bg_inode_table +
+ printf(range_format, fs->group_desc[i].bg_inode_table,
+ fs->group_desc[i].bg_inode_table +
inode_blocks_per_group - 1);
diff = fs->group_desc[i].bg_inode_table - group_blk;
if (diff > 0)
printf(" (+%ld)", diff);
printf (_("\n %d free blocks, %d free inodes, "
- "%d directories\n Free blocks: "),
+ "%d directories\n"),
fs->group_desc[i].bg_free_blocks_count,
fs->group_desc[i].bg_free_inodes_count,
fs->group_desc[i].bg_used_dirs_count);
- print_free (i, block_bitmap, fs->super->s_blocks_per_group,
- fs->super->s_first_data_block);
- fputs(_("\n Free inodes: "), stdout);
- print_free (i, inode_bitmap, fs->super->s_inodes_per_group, 1);
- fputc('\n', stdout);
- block_bitmap += fs->super->s_blocks_per_group / 8;
- inode_bitmap += fs->super->s_inodes_per_group / 8;
+ if (block_bitmap) {
+ fputs(_(" Free blocks: "), stdout);
+ print_free (i, block_bitmap,
+ fs->super->s_blocks_per_group,
+ fs->super->s_first_data_block);
+ fputc('\n', stdout);
+ block_bitmap += fs->super->s_blocks_per_group / 8;
+ }
+ if (inode_bitmap) {
+ fputs(_(" Free inodes: "), stdout);
+ print_free (i, inode_bitmap,
+ fs->super->s_inodes_per_group, 1);
+ fputc('\n', stdout);
+ inode_bitmap += fs->super->s_inodes_per_group / 8;
+ }
group_blk = next_blk;
}
}
-static void list_bad_blocks(ext2_filsys fs)
+static void list_bad_blocks(ext2_filsys fs, int dump)
{
badblocks_list bb_list = 0;
badblocks_iterate bb_iter;
blk_t blk;
errcode_t retval;
+ const char *header, *fmt;
retval = ext2fs_read_bb_inode(fs, &bb_list);
if (retval) {
com_err("ext2fs_read_bb_inode", retval, "");
- exit(1);
+ return;
}
retval = ext2fs_badblocks_list_iterate_begin(bb_list, &bb_iter);
if (retval) {
com_err("ext2fs_badblocks_list_iterate_begin", retval,
_("while printing bad block list"));
- exit(1);
+ return;
}
- if (ext2fs_badblocks_list_iterate(bb_iter, &blk))
- printf(_("Bad blocks: %d"), blk);
- while (ext2fs_badblocks_list_iterate(bb_iter, &blk))
- printf(", %d", blk);
- ext2fs_badblocks_list_iterate_end(bb_iter);
- fputc('\n', stdout);
-}
-
-static void dump_bad_blocks(ext2_filsys fs)
-{
- badblocks_list bb_list = 0;
- badblocks_iterate bb_iter;
- blk_t blk;
- errcode_t retval;
-
- retval = ext2fs_read_bb_inode(fs, &bb_list);
- if (retval) {
- com_err("ext2fs_read_bb_inode", retval, "");
- exit(1);
+ if (dump) {
+ header = fmt = "%d\n";
+ } else {
+ header = _("Bad blocks: %d");
+ fmt = ", %d";
}
- retval = ext2fs_badblocks_list_iterate_begin(bb_list, &bb_iter);
- if (retval) {
- com_err("ext2fs_badblocks_list_iterate_begin", retval,
- _("while printing bad block list"));
- exit(1);
+ while (ext2fs_badblocks_list_iterate(bb_iter, &blk)) {
+ printf(header ? header : fmt, blk);
+ header = 0;
}
- while (ext2fs_badblocks_list_iterate(bb_iter, &blk))
- printf("%d\n", blk);
ext2fs_badblocks_list_iterate_end(bb_iter);
+ if (!dump)
+ fputc('\n', stdout);
}
static void print_journal_information(ext2_filsys fs)
errcode_t retval;
char buf[1024];
char str[80];
- int i;
+ unsigned int i;
journal_superblock_t *jsb;
/* Get the journal superblock */
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, "");
+ setlocale(LC_CTYPE, "");
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
}
if (optind > argc - 1)
usage();
+ sprintf(range_format, "%s-%s", num_format, num_format);
device_name = argv[optind++];
if (use_superblock && !use_blocksize)
use_blocksize = 1024;
exit (1);
}
if (print_badblocks) {
- dump_bad_blocks(fs);
+ list_bad_blocks(fs, 1);
} else {
big_endian = ((fs->flags & EXT2_FLAG_SWAP_BYTES) != 0);
#ifdef WORDS_BIGENDIAN
ext2fs_close(fs);
exit(0);
}
- list_bad_blocks (fs);
+ list_bad_blocks(fs, 0);
if (header_only) {
ext2fs_close (fs);
exit (0);
}
retval = ext2fs_read_bitmaps (fs);
+ list_desc (fs);
if (retval) {
- com_err (program_name, retval,
- _("while trying to read the bitmaps"),
- device_name);
- ext2fs_close (fs);
- exit (1);
+ printf(_("\n%s: %s: error reading bitmaps: %s\n"),
+ program_name, device_name,
+ error_message(retval));
}
- list_desc (fs);
}
ext2fs_close (fs);
exit (0);
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff