#include <string.h>
#include <unistd.h>
-#include <linux/ext2_fs.h>
+#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
#include "e2p/e2p.h"
+#include "jfs_user.h"
+#include <uuid/uuid.h>
#include "../version.h"
#include "nls-enable.h"
const char * program_name = "dumpe2fs";
char * device_name = NULL;
-int opt_hex = 0;
+const char *num_format = "%lu";
+char range_format[16];
static void usage(void)
{
- fprintf (stderr, _("Usage: %s [-bfhxV] [-ob superblock] "
+ fprintf (stderr, _("Usage: %s [-bfhixV] [-ob superblock] "
"[-oB blocksize] device\n"), program_name);
exit (1);
}
unsigned long i;
unsigned long j;
+ offset += group * nbytes;
for (i = 0; i < nbytes; i++)
if (!in_use (bitmap, i))
{
if (p)
printf (", ");
- if (i == nbytes - 1 || in_use (bitmap, i + 1))
- printf (opt_hex ? "0x%04x" : "%lu",
- group * nbytes + i + offset);
- else
- {
- for (j = i; j < nbytes && !in_use (bitmap, j);
- j++)
- ;
- printf (opt_hex ? "0x%04lx-0x%04lx" :
- "%lu-%lu", group * nbytes + i + offset,
- group * nbytes + (j - 1) + offset);
- i = j - 1;
+ printf (num_format, i + offset);
+ for (j = i; j < nbytes && !in_use (bitmap, j); j++)
+ ;
+ if (--j != i) {
+ fputc('-', stdout);
+ printf(num_format, j + offset);
+ i = j;
}
p = 1;
}
static void list_desc (ext2_filsys fs)
{
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;
EXT2_DESC_PER_BLOCK(fs->super) - 1) /
EXT2_DESC_PER_BLOCK(fs->super);
- printf ("\n");
+ fputc('\n', stdout);
group_blk = fs->super->s_first_data_block;
for (i = 0; i < fs->group_desc_count; i++) {
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 (opt_hex ? _("Group %lu: (Blocks %04x -- %04x)\n"):
- _("Group %lu: (Blocks %u -- %u)\n"), i,
- group_blk, next_blk -1 );
- if (ext2fs_bg_has_super (fs, i))
- printf (opt_hex ? _(" %s Superblock at 0x%04x,"
- " Group Descriptors at 0x%04x-0x%04x\n"):
- _(" %s Superblock at %u,"
- " Group Descriptors at %u-%u\n"),
- i == 0 ? _("Primary") : _("Backup"),
- group_blk, group_blk + 1,
- group_blk + group_desc_blocks);
- printf (opt_hex ? _(" Block bitmap at %04x (+%d), "
- "Inode bitmap at %04x (+%d)\n "
- "Inode table at %04x-%04x (+%d)\n"):
- _(" Block bitmap at %u (+%d), "
- "Inode bitmap at %u (+%d)\n "
- "Inode table at %u (+%d)\n"),
- fs->group_desc[i].bg_block_bitmap,
- fs->group_desc[i].bg_block_bitmap - group_blk,
- fs->group_desc[i].bg_inode_bitmap,
- fs->group_desc[i].bg_inode_bitmap - group_blk,
- fs->group_desc[i].bg_inode_table,
- fs->group_desc[i].bg_inode_table +
- inode_blocks_per_group,
- fs->group_desc[i].bg_inode_table - group_blk);
- printf (_(" %d free blocks, %d free inodes, %d directories\n"),
+ printf (_("Group %lu: (Blocks "), i);
+ printf(range_format, group_blk, next_blk - 1);
+ fputs(")\n", stdout);
+ if (ext2fs_bg_has_super (fs, i)) {
+ printf (_(" %s Superblock at "),
+ i == 0 ? _("Primary") : _("Backup"));
+ printf(num_format, group_blk);
+ printf(_(", Group Descriptors at "));
+ printf(range_format, group_blk+1,
+ group_blk + group_desc_blocks);
+ fputc('\n', stdout);
+ }
+ fputs(_(" Block bitmap at "), stdout);
+ printf(num_format, 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);
+ diff = fs->group_desc[i].bg_inode_bitmap - group_blk;
+ if (diff >= 0)
+ printf(" (+%ld)", diff);
+ fputs(_("\n Inode table at "), stdout);
+ 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: "),
fs->group_desc[i].bg_free_blocks_count,
fs->group_desc[i].bg_free_inodes_count,
fs->group_desc[i].bg_used_dirs_count);
- printf (_(" Free blocks: "));
print_free (i, block_bitmap, fs->super->s_blocks_per_group,
fs->super->s_first_data_block);
- block_bitmap += fs->super->s_blocks_per_group / 8;
- printf ("\n");
- printf (_(" Free inodes: "));
+ 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;
- printf ("\n");
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 = badblocks_list_iterate_begin(bb_list, &bb_iter);
+ retval = ext2fs_badblocks_list_iterate_begin(bb_list, &bb_iter);
if (retval) {
- com_err("badblocks_list_iterate_begin", retval,
+ com_err("ext2fs_badblocks_list_iterate_begin", retval,
_("while printing bad block list"));
- exit(1);
+ return;
+ }
+ if (dump) {
+ header = fmt = "%d\n";
+ } else {
+ header = _("Bad blocks: %d");
+ fmt = ", %d";
+ }
+ while (ext2fs_badblocks_list_iterate(bb_iter, &blk)) {
+ printf(header ? header : fmt, blk);
+ header = 0;
}
- if (badblocks_list_iterate(bb_iter, &blk))
- printf(_("Bad blocks: %d"), blk);
- while (badblocks_list_iterate(bb_iter, &blk))
- printf(", %d", blk);
- badblocks_list_iterate_end(bb_iter);
- printf("\n");
+ ext2fs_badblocks_list_iterate_end(bb_iter);
+ if (!dump)
+ fputc('\n', stdout);
}
-static void dump_bad_blocks(ext2_filsys fs)
+static void print_journal_information(ext2_filsys fs)
{
- badblocks_list bb_list = 0;
- badblocks_iterate bb_iter;
- blk_t blk;
- errcode_t retval;
+ errcode_t retval;
+ char buf[1024];
+ char str[80];
+ int i;
+ journal_superblock_t *jsb;
- retval = ext2fs_read_bb_inode(fs, &bb_list);
- if (retval) {
- com_err("ext2fs_read_bb_inode", retval, "");
+ /* Get the journal superblock */
+ if ((retval = io_channel_read_blk(fs->io, fs->super->s_first_data_block+1, -1024, buf))) {
+ com_err(program_name, retval,
+ _("while reading journal superblock"));
exit(1);
}
- retval = badblocks_list_iterate_begin(bb_list, &bb_iter);
- if (retval) {
- com_err("badblocks_list_iterate_begin", retval,
- _("while printing bad block list"));
+ jsb = (journal_superblock_t *) buf;
+ if ((jsb->s_header.h_magic != (unsigned) ntohl(JFS_MAGIC_NUMBER)) ||
+ (jsb->s_header.h_blocktype !=
+ (unsigned) ntohl(JFS_SUPERBLOCK_V2))) {
+ com_err(program_name, 0,
+ _("Couldn't find journal superblock magic numbers"));
exit(1);
}
- while (badblocks_list_iterate(bb_iter, &blk))
- printf("%d\n", blk);
- badblocks_list_iterate_end(bb_iter);
-}
-static int i386_byteorder(void)
-{
- int one = 1;
- char *cp = (char *) &one;
+ printf(_("\nJournal block size: %d\n"
+ "Journal length: %d\n"
+ "Journal first block: %d\n"
+ "Journal sequence: 0x%08x\n"
+ "Journal start: %d\n"
+ "Journal number of users: %d\n"),
+ ntohl(jsb->s_blocksize), ntohl(jsb->s_maxlen),
+ ntohl(jsb->s_first), ntohl(jsb->s_sequence),
+ ntohl(jsb->s_start), ntohl(jsb->s_nr_users));
- return (*cp == 1);
+ for (i=0; i < ntohl(jsb->s_nr_users); i++) {
+ uuid_unparse(&jsb->s_users[i*16], str);
+ printf(i ? " %s\n"
+ : "Journal users: %s\n",
+ str);
+ }
}
int main (int argc, char ** argv)
int print_badblocks = 0;
int use_superblock = 0;
int use_blocksize = 0;
+ int image_dump = 0;
int force = 0;
+ int flags;
int header_only = 0;
int big_endian;
int c;
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, "");
+ setlocale(LC_CTYPE, "");
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
initialize_ext2_error_table();
- fprintf (stderr, _("dumpe2fs %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "dumpe2fs %s (%s)\n", E2FSPROGS_VERSION,
+ E2FSPROGS_DATE);
if (argc && *argv)
program_name = *argv;
- while ((c = getopt (argc, argv, "bfhxVo:")) != EOF) {
+ while ((c = getopt (argc, argv, "bfhixVo:")) != EOF) {
switch (c) {
case 'b':
print_badblocks++;
case 'h':
header_only++;
break;
+ case 'i':
+ image_dump++;
+ break;
case 'o':
if (optarg[0] == 'b')
use_superblock = atoi(optarg+1);
error_message(EXT2_ET_BASE));
exit(0);
case 'x':
- opt_hex=1;
+ num_format = "0x%04x";
break;
default:
usage();
}
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;
- retval = ext2fs_open (device_name, force ? EXT2_FLAG_FORCE : 0,
- use_superblock, use_blocksize,
- unix_io_manager, &fs);
+ flags = EXT2_FLAG_JOURNAL_DEV_OK;
+ if (force)
+ flags |= EXT2_FLAG_FORCE;
+ if (image_dump)
+ flags |= EXT2_FLAG_IMAGE_FILE;
+
+ retval = ext2fs_open (device_name, flags, use_superblock,
+ use_blocksize, unix_io_manager, &fs);
if (retval) {
com_err (program_name, retval, _("while trying to open %s"),
device_name);
exit (1);
}
if (print_badblocks) {
- dump_bad_blocks(fs);
+ list_bad_blocks(fs, 1);
} else {
big_endian = ((fs->flags & EXT2_FLAG_SWAP_BYTES) != 0);
- if (!i386_byteorder())
- big_endian = !big_endian;
+#ifdef WORDS_BIGENDIAN
+ big_endian = !big_endian;
+#endif
if (big_endian)
printf(_("Note: This is a byte-swapped filesystem\n"));
list_super (fs->super);
- list_bad_blocks (fs);
+ if (fs->super->s_feature_incompat &
+ EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
+ print_journal_information(fs);
+ ext2fs_close(fs);
+ exit(0);
+ }
+ list_bad_blocks(fs, 0);
if (header_only) {
ext2fs_close (fs);
exit (0);
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff