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

Timestamp:

2011-02-23T18:21:55Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

ad34feb

Parents:

f483a15

Message:

More strict inode type checking

File:

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

uspace/app/ext2info/ext2info.c

@@ -346 +346 @@
 {
         uint32_t mode;
+        uint32_t mode_type;
         uint32_t user_id;
         uint32_t group_id;
@@ -358 +359 @@
         
         mode = ext2_inode_get_mode(fs->superblock, inode);
+        mode_type = mode & EXT2_INODE_MODE_TYPE_MASK;
         user_id = ext2_inode_get_user_id(fs->superblock, inode);
         group_id = ext2_inode_get_group_id(fs->superblock, inode);
@@ -365 +367 @@
         
         type = "Unknown";
-        if ((mode & EXT2_INODE_MODE_BLOCKDEV) == EXT2_INODE_MODE_BLOCKDEV) {
+        if (mode_type == EXT2_INODE_MODE_BLOCKDEV) {
                 type = "Block device";
         }
-        else if (mode & EXT2_INODE_MODE_FIFO) {
+        else if (mode_type == EXT2_INODE_MODE_FIFO) {
                 type = "Fifo (pipe)";
         }
-        else if (mode & EXT2_INODE_MODE_CHARDEV) {
+        else if (mode_type == EXT2_INODE_MODE_CHARDEV) {
                 type = "Character device";
         }
-        else if (mode & EXT2_INODE_MODE_DIRECTORY) {
+        else if (mode_type == EXT2_INODE_MODE_DIRECTORY) {
                 type = "Directory";
         }
-        else if (mode & EXT2_INODE_MODE_FILE) {
+        else if (mode_type == EXT2_INODE_MODE_FILE) {
                 type = "File";
         }
-        else if (mode & EXT2_INODE_MODE_SOFTLINK) {
+        else if (mode_type == EXT2_INODE_MODE_SOFTLINK) {
                 type = "Soft link";
         }
-        else if (mode & EXT2_INODE_MODE_SOCKET) {
+        else if (mode_type == EXT2_INODE_MODE_SOCKET) {
                 type = "Socket";
         }