extern int optind;
extern char *optarg;
#endif
-#ifdef HAVE_OPTRESET
-extern int optreset; /* defined by BSD, but not others */
-#endif
#include "debugfs.h"
static void htree_dump_leaf_node(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
- struct ext2_dx_root_info * root,
+ struct ext2_dx_root_info * rootnode,
blk_t blk, char *buf)
{
errcode_t errcode;
struct ext2_dir_entry *dirent;
- int thislen, col = 0, offset = 0;
- char name[EXT2_NAME_LEN];
+ int thislen, col = 0;
+ unsigned int offset = 0;
+ char name[EXT2_NAME_LEN + 1];
char tmp[EXT2_NAME_LEN + 16];
blk_t pblk;
ext2_dirhash_t hash;
+ int hash_alg;
errcode = ext2fs_bmap(fs, ino, inode, buf, 0, blk, &pblk);
if (errcode) {
com_err("htree_dump_leaf_node", errcode,
- "while mapping logical block %d\n", blk);
+ "while mapping logical block %u\n", blk);
return;
}
errcode = ext2fs_read_dir_block2(current_fs, pblk, buf, 0);
if (errcode) {
com_err("htree_dump_leaf_node", errcode,
- "while reading block %d\n", blk);
+ "while reading block %u\n", blk);
return;
}
+ hash_alg = rootnode->hash_version;
+ if ((hash_alg <= EXT2_HASH_TEA) &&
+ (fs->super->s_flags & EXT2_FLAGS_UNSIGNED_HASH))
+ hash_alg += 3;
while (offset < fs->blocksize) {
dirent = (struct ext2_dir_entry *) (buf + offset);
(dirent->rec_len < 8) ||
((dirent->rec_len % 4) != 0) ||
(((dirent->name_len & 0xFF)+8) > dirent->rec_len)) {
- fprintf(pager, "Corrupted directory block (%d)!\n", blk);
+ fprintf(pager, "Corrupted directory block (%u)!\n", blk);
break;
}
thislen = ((dirent->name_len & 0xFF) < EXT2_NAME_LEN) ?
(dirent->name_len & 0xFF) : EXT2_NAME_LEN;
strncpy(name, dirent->name, thislen);
name[thislen] = '\0';
- errcode = ext2fs_dirhash(root->hash_version, name, thislen,
- fs->super->s_hash_seed,
+ errcode = ext2fs_dirhash(hash_alg, name,
+ thislen, fs->super->s_hash_seed,
&hash, 0);
if (errcode)
com_err("htree_dump_leaf_node", errcode,
static void htree_dump_int_block(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
- struct ext2_dx_root_info * root,
+ struct ext2_dx_root_info * rootnode,
blk_t blk, char *buf, int level);
static void htree_dump_int_node(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
- struct ext2_dx_root_info * root,
+ struct ext2_dx_root_info * rootnode,
struct ext2_dx_entry *ent,
char *buf, int level)
{
for (i=0; i < limit.count; i++) {
hash = i ? ext2fs_le32_to_cpu(ent[i].hash) : 0;
- fprintf(pager, "Entry #%d: Hash 0x%08x%s, block %d\n", i,
+ fprintf(pager, "Entry #%d: Hash 0x%08x%s, block %u\n", i,
hash, (hash & 1) ? " (**)" : "",
ext2fs_le32_to_cpu(ent[i].block));
}
for (i=0; i < limit.count; i++) {
e.hash = ext2fs_le32_to_cpu(ent[i].hash);
e.block = ext2fs_le32_to_cpu(ent[i].block);
- fprintf(pager, "Entry #%d: Hash 0x%08x, block %d\n", i,
+ fprintf(pager, "Entry #%d: Hash 0x%08x, block %u\n", i,
i ? e.hash : 0, e.block);
if (level)
- htree_dump_int_block(fs, ino, inode, root,
+ htree_dump_int_block(fs, ino, inode, rootnode,
e.block, buf, level-1);
else
- htree_dump_leaf_node(fs, ino, inode, root,
+ htree_dump_leaf_node(fs, ino, inode, rootnode,
e.block, buf);
}
static void htree_dump_int_block(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
- struct ext2_dx_root_info * root,
+ struct ext2_dx_root_info * rootnode,
blk_t blk, char *buf, int level)
{
char *cbuf;
errcode = ext2fs_bmap(fs, ino, inode, buf, 0, blk, &pblk);
if (errcode) {
com_err("htree_dump_int_block", errcode,
- "while mapping logical block %d\n", blk);
- return;
+ "while mapping logical block %u\n", blk);
+ goto errout;
}
errcode = io_channel_read_blk(current_fs->io, pblk, 1, buf);
if (errcode) {
com_err("htree_dump_int_block", errcode,
- "while reading block %d\n", blk);
- return;
+ "while reading block %u\n", blk);
+ goto errout;
}
- htree_dump_int_node(fs, ino, inode, root,
+ htree_dump_int_node(fs, ino, inode, rootnode,
(struct ext2_dx_entry *) (buf+8),
cbuf, level);
+errout:
free(cbuf);
}
{
ext2_ino_t ino;
struct ext2_inode inode;
- int retval;
- int i, c;
- int flags;
- int long_opt;
- void *buf = NULL;
- struct ext2_dx_root_info *root;
+ int c;
+ int long_opt = 0;
+ char *buf = NULL;
+ struct ext2_dx_root_info *rootnode;
struct ext2_dx_entry *ent;
struct ext2_dx_countlimit *limit;
errcode_t errcode;
pager = open_pager();
- optind = 0;
-#ifdef HAVE_OPTRESET
- optreset = 1; /* Makes BSD getopt happy */
-#endif
+ reset_getopt();
while ((c = getopt (argc, argv, "l")) != EOF) {
switch (c) {
case 'l':
long_opt++;
break;
+ default:
+ goto print_usage;
}
}
if (argc > optind+1) {
+ print_usage:
com_err(0, 0, "Usage: htree_dump [-l] file");
goto errout;
}
goto errout;
}
- root = (struct ext2_dx_root_info *) (buf + 24);
+ rootnode = (struct ext2_dx_root_info *) (buf + 24);
fprintf(pager, "Root node dump:\n");
- fprintf(pager, "\t Reserved zero: %d\n", root->reserved_zero);
- fprintf(pager, "\t Hash Version: %d\n", root->hash_version);
- fprintf(pager, "\t Info length: %d\n", root->info_length);
- fprintf(pager, "\t Indirect levels: %d\n", root->indirect_levels);
- fprintf(pager, "\t Flags: %d\n", root->unused_flags);
+ fprintf(pager, "\t Reserved zero: %u\n", rootnode->reserved_zero);
+ fprintf(pager, "\t Hash Version: %d\n", rootnode->hash_version);
+ fprintf(pager, "\t Info length: %d\n", rootnode->info_length);
+ fprintf(pager, "\t Indirect levels: %d\n", rootnode->indirect_levels);
+ fprintf(pager, "\t Flags: %d\n", rootnode->unused_flags);
- ent = (struct ext2_dx_entry *) (buf + 24 + root->info_length);
+ ent = (struct ext2_dx_entry *) (buf + 24 + rootnode->info_length);
limit = (struct ext2_dx_countlimit *) ent;
- htree_dump_int_node(current_fs, ino, &inode, root, ent,
+ htree_dump_int_node(current_fs, ino, &inode, rootnode, ent,
buf + current_fs->blocksize,
- root->indirect_levels);
+ rootnode->indirect_levels);
errout:
if (buf)
__u32 hash_seed[4];
hash_seed[0] = hash_seed[1] = hash_seed[2] = hash_seed[3] = 0;
- optind = 0;
-#ifdef HAVE_OPTRESET
- optreset = 1; /* Makes BSD getopt happy */
-#endif
+
+ reset_getopt();
while ((c = getopt (argc, argv, "h:")) != EOF) {
switch (c) {
case 'h':
hash_version = atoi(optarg);
break;
+ default:
+ goto print_usage;
}
}
if (optind != argc-1) {
+ print_usage:
com_err(argv[0], 0, "usage: dx_hash filename");
return;
}
void do_dirsearch(int argc, char *argv[])
{
ext2_ino_t inode;
- int retval;
- int c;
- int flags;
struct process_block_struct pb;
if (check_fs_open(argv[0]))
static int search_dir_block(ext2_filsys fs, blk_t *blocknr,
- e2_blkcnt_t blockcnt, blk_t ref_blk,
- int ref_offset, void *priv_data)
+ e2_blkcnt_t blockcnt,
+ blk_t ref_blk EXT2FS_ATTR((unused)),
+ int ref_offset EXT2FS_ATTR((unused)),
+ void *priv_data)
{
struct process_block_struct *p;
struct ext2_dir_entry *dirent;
errcode_t errcode;
- int offset = 0;
+ unsigned int offset = 0;
if (blockcnt < 0)
return 0;
errcode = io_channel_read_blk(current_fs->io, *blocknr, 1, p->buf);
if (errcode) {
com_err("search_dir_block", errcode,
- "while reading block %lu", *blocknr);
+ "while reading block %lu", (unsigned long) *blocknr);
return BLOCK_ABORT;
}
strncmp(p->search_name, dirent->name,
p->len) == 0) {
printf("Entry found at logical block %lld, "
- "phys %d, offset %d\n", blockcnt,
+ "phys %u, offset %u\n", (long long)blockcnt,
*blocknr, offset);
- printf("offset %d\n", offset);
+ printf("offset %u\n", offset);
return BLOCK_ABORT;
}
offset += dirent->rec_len;
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff