Changeset 1fe186f in mainline

Timestamp:

2008-01-27T10:47:15Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

72bde81

Parents:

b8b23c8

Message:

Move handling of the miss on excessive components out of the main loop in
tmpfs_lookup.

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -246 +246 @@
         char component[NAME_MAX + 1];
         int len = 0;
-        while (next <= last) {
+        while (dtmp && next <= last) {
 
                 /* collect the component */
@@ -296 +296 @@
                 dcur = dtmp;
                 dtmp = dtmp->child;
-
-                /* handle miss: excessive components */
-                if (!dtmp && next <= last) {
-                        if (lflag & L_CREATE) {
-                                if (dcur->type != TMPFS_DIRECTORY) {
-                                        ipc_answer_0(rid, ENOTDIR);
+        }
+
+        /* handle miss: excessive components */
+        if (!dtmp && next <= last) {
+                if (lflag & L_CREATE) {
+                        if (dcur->type != TMPFS_DIRECTORY) {
+                                ipc_answer_0(rid, ENOTDIR);
+                                return;
+                        }
+
+                        /* collect next component */
+                        while (next <= last) {
+                                if (PLB_GET_CHAR(next) == '/') {
+                                        /* more than one component */
+                                        ipc_answer_0(rid, ENOENT);
                                         return;
                                 }
-
-                                /* collect next component */
-                                while (next <= last) {
-                                        if (PLB_GET_CHAR(next) == '/') {
-                                                /* more than one component */
-                                                ipc_answer_0(rid, ENOENT);
-                                                return;
-                                        }
-                                        if (len + 1 == NAME_MAX) {
-                                                /* component length overflow */
-                                                ipc_answer_0(rid, ENAMETOOLONG);
-                                                return;
-                                        }
-                                        component[len++] = PLB_GET_CHAR(next);
-                                        next++; /* process next character */
+                                if (len + 1 == NAME_MAX) {
+                                        /* component length overflow */
+                                        ipc_answer_0(rid, ENAMETOOLONG);
+                                        return;
                                 }
-                                assert(len);
-                                component[len] = '\0';
-                                len = 0;
+                                component[len++] = PLB_GET_CHAR(next);
+                                next++; /* process next character */
+                        }
+                        assert(len);
+                        component[len] = '\0';
+                        len = 0;
                                 
-                                unsigned long index;
-                                index = create_node(dcur, component, lflag);
-                                if (index) {
-                                        ipc_answer_4(rid, EOK,
-                                            tmpfs_reg.fs_handle, dev_handle,
-                                            index, 0);
-                                } else {
-                                        ipc_answer_0(rid, ENOSPC);
-                                }
-                                return;
+                        unsigned long index;
+                        index = create_node(dcur, component, lflag);
+                        if (index) {
+                                ipc_answer_4(rid, EOK, tmpfs_reg.fs_handle,
+                                    dev_handle, index, 0);
+                        } else {
+                                ipc_answer_0(rid, ENOSPC);
                         }
-                        ipc_answer_0(rid, ENOENT);
                         return;
                 }
-        
+                ipc_answer_0(rid, ENOENT);
+                return;
         }