Changeset a54af66 in mainline

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

Location:

uspace

Files:

• app/ext2info/ext2info.c (modified) (3 diffs)
• lib/ext2/libext2_inode.c (modified) (2 diffs)
• lib/ext2/libext2_inode.h (modified) (2 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";
         }

uspace/lib/ext2/libext2_inode.c

@@ -54 +54 @@
 
 /**
+ * Check whether inode is of given type
+ * 
+ * @param sb pointer to superblock structure
+ * @param inode pointer to inode
+ * @param type EXT2_INODE_MODE_TYPE_* constant to check
+ */
+inline bool ext2_inode_is_type(ext2_superblock_t *sb, ext2_inode_t *inode, uint32_t type)
+{
+        uint32_t mode = ext2_inode_get_mode(sb, inode);
+        return (mode & EXT2_INODE_MODE_TYPE_MASK) == type;
+}
+
+/**
  * Get uid this inode is belonging to
  * 
@@ -79 +92 @@
 {
         uint32_t major_rev = ext2_superblock_get_rev_major(sb);
-        uint32_t mode = ext2_inode_get_mode(sb, inode);
         
-        if (major_rev > 0 && mode & EXT2_INODE_MODE_FILE) {
+        if (major_rev > 0 && ext2_inode_is_type(sb, inode, EXT2_INODE_MODE_FILE)) {
                 return ((uint64_t)uint32_t_le2host(inode->size_high)) << 32 |
                     ((uint64_t)uint32_t_le2host(inode->size));

uspace/lib/ext2/libext2_inode.h

@@ -74 +74 @@
 #define EXT2_INODE_MODE_SOCKET          0xC000
 #define EXT2_INODE_MODE_ACCESS_MASK     0x0FFF
+#define EXT2_INODE_MODE_TYPE_MASK       0xF000
 
 typedef struct ext2_inode_ref {
@@ -81 +82 @@
 
 inline uint32_t ext2_inode_get_mode(ext2_superblock_t *, ext2_inode_t *);
+inline bool ext2_inode_is_type(ext2_superblock_t *, ext2_inode_t *, uint32_t);
 inline uint32_t ext2_inode_get_user_id(ext2_superblock_t *, ext2_inode_t *);
 inline uint64_t ext2_inode_get_size(ext2_superblock_t *, ext2_inode_t *);