Changeset 7d04324 in mainline

Timestamp:

2011-03-17T21:10:13Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

f213ae7

Parents:

5a58ae2

Message:

Link mfs_is_directory() and mfs_is_file() functions to the libfs_ops structure

Location:

uspace

Files:

• lib/minix/minix.h (modified) (1 diff)
• srv/fs/minixfs/mfs.h (modified) (1 diff)
• srv/fs/minixfs/mfs_ops.c (modified) (2 diffs)

uspace/lib/minix/minix.h

@@ -38 +38 @@
 #define MFS_BLOCKSIZE           1024
 #define S_ISDIR(m)              (((m) & S_IFMT) == S_IFDIR)
-#define S_IFDIR                 0040000
+#define S_ISREG(m)              (((m) & S_IFMT) == S_IFREG)
+#define S_IFDIR                 0040000         /*Directory*/
+#define S_IFREG                 0100000         /*Regular file*/
 #define S_IFMT                  00170000
 

uspace/srv/fs/minixfs/mfs.h

@@ -101 +101 @@
 extern void mfs_mount(ipc_callid_t rid, ipc_call_t *request);
 extern bool mfs_is_directory(fs_node_t *fsnode);
+extern bool mfs_is_file(fs_node_t *fsnode);
 extern devmap_handle_t mfs_device_get(fs_node_t *fsnode);
 extern int  mfs_get_instance(devmap_handle_t handle,

uspace/srv/fs/minixfs/mfs_ops.c

@@ -46 +46 @@
 libfs_ops_t mfs_libfs_ops = {
         .device_get = mfs_device_get,
-        .is_directory = mfs_is_directory
+        .is_directory = mfs_is_directory,
+        .is_file = mfs_is_file
 };
 
@@ -214 +215 @@
 }
 
+bool mfs_is_file(fs_node_t *fsnode)
+{
+        struct mfs_node *node = fsnode->data;
+        struct mfs_sb_info *sbi = node->instance->sbi;
+
+        if (sbi->fs_version == MFS_VERSION_V1)
+                return S_ISREG(node->ino->i_mode);
+        else
+                return S_ISREG(node->ino2->i_mode);
+}
+
 /*
  * Find a filesystem instance given the devmap handle