Changeset b65cae22 in mainline for uspace/app/ext2info/ext2info.c

Timestamp:

2011-02-16T20:21:03Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f483a15

Parents:

a2a1792

Message:

Add support for some OS specific fields

File:

• uspace/app/ext2info/ext2info.c (modified) (5 diffs)

uspace/app/ext2info/ext2info.c

@@ -57 +57 @@
 static void print_block_group(ext2_block_group_t *);
 static void print_inode_by_number(ext2_filesystem_t *, uint32_t);
-static void print_inode(ext2_inode_t *);
+static void print_inode(ext2_filesystem_t *, ext2_inode_t *);
 
 #define ARG_SUPERBLOCK 1
@@ -335 +335 @@
         }
         
-        print_inode(inode_ref->inode);
+        print_inode(fs, inode_ref->inode);
         
         rc = ext2_filesystem_put_inode_ref(inode_ref);
@@ -343 +343 @@
 }
 
-void print_inode(ext2_inode_t *inode)
-{
-        uint16_t mode;
+void print_inode(ext2_filesystem_t *fs, ext2_inode_t *inode)
+{
+        uint32_t mode;
         uint32_t user_id;
         uint32_t group_id;
-        uint32_t size;
+        uint64_t size;
         uint16_t usage_count;
         uint32_t flags;
@@ -357 +357 @@
         bool all_blocks = false;
         
-        mode = ext2_inode_get_mode(inode);
-        user_id = ext2_inode_get_user_id(inode);
-        group_id = ext2_inode_get_group_id(inode);
-        size = ext2_inode_get_size(inode);
+        mode = ext2_inode_get_mode(fs->superblock, inode);
+        user_id = ext2_inode_get_user_id(fs->superblock, inode);
+        group_id = ext2_inode_get_group_id(fs->superblock, inode);
+        size = ext2_inode_get_size(fs->superblock, inode);
         usage_count = ext2_inode_get_usage_count(inode);
         flags = ext2_inode_get_flags(inode);
@@ -389 +389 @@
         access = mode & EXT2_INODE_MODE_ACCESS_MASK;
         
-        printf("  Mode: %04x (Type: %s, Access bits: %04ho)\n", mode, type, access);
+        printf("  Mode: %08x (Type: %s, Access bits: %04ho)\n", mode, type, access);
         printf("  User ID: %u\n", user_id);
         printf("  Group ID: %u\n", group_id);
-        printf("  Size: %u\n", size);
+        printf("  Size: %" PRIu64 "\n", size);
         printf("  Usage (link) count: %u\n", usage_count);
         printf("  Flags: %u\n", flags);