Changeset 0b18364 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2013-07-24T20:43:38Z (11 years ago)

Author:

Ji?? Z?rev?cky <zarevucky.jiri@…>

Branches:

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

Children:

9a8c188

Parents:

cb65bbe

Message:

Implement client side of walk and open.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -568 +568 @@
 }
 
+static inline bool walk_flags_valid(int flags)
+{
+        if ((flags&~WALK_ALL_FLAGS) != 0) {
+                return false;
+        }
+        if ((flags&WALK_MAY_CREATE) && (flags&WALK_MUST_CREATE)) {
+                return false;
+        }
+        if ((flags&WALK_REGULAR) && (flags&WALK_DIRECTORY)) {
+                return false;
+        }
+        if ((flags&WALK_MAY_CREATE) || (flags&WALK_MUST_CREATE)) {
+                if (!(flags&WALK_DIRECTORY) && !(flags&WALK_REGULAR)) {
+                        return false;
+                }
+        }
+        return true;
+}
+
+static inline int walk_lookup_flags(int flags)
+{
+        int lflags = 0;
+        if (flags&WALK_MAY_CREATE || flags&WALK_MUST_CREATE) {
+                lflags |= L_CREATE;
+        }
+        if (flags&WALK_MUST_CREATE) {
+                lflags |= L_EXCLUSIVE;
+        }
+        if (flags&WALK_REGULAR) {
+                lflags |= L_FILE;
+        }
+        if (flags&WALK_DIRECTORY) {
+                lflags |= L_DIRECTORY;
+        }
+        return lflags;
+}
+
 void vfs_walk(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -577 +614 @@
         int flags = IPC_GET_ARG2(*request);
         
-        if ((flags&~WALK_ALL_FLAGS) != 0) {
-                /* Invalid flags. */
+        if (!walk_flags_valid(flags)) {
                 async_answer_0(rid, EINVAL);
                 return;
@@ -603 +639 @@
         
         vfs_lookup_res_t lr;
-        rc = vfs_lookup_internal(path, 0, &lr, parent_node);
+        rc = vfs_lookup_internal(path, walk_lookup_flags(flags), &lr, parent_node);
         free(path);