Changeset 736c164 in mainline for uspace/lib/libfs

Timestamp:

2008-03-30T22:30:32Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

94b0b63

Parents:

81c0171e

Message:

Make libfs_lookup() more generic.

Location:

uspace/lib/libfs

Files:

• libfs.c (modified) (4 diffs)
• libfs.h (modified) (2 diffs)

uspace/lib/libfs/libfs.c

@@ -149 +149 @@
         void *par = NULL;
         void *cur = ops->root_get();
-        void *tmp = ops->child_get(cur);
+        void *tmp;
 
         if (ops->plb_get_char(next) == '/')
@@ -156 +156 @@
         char component[NAME_MAX + 1];
         int len = 0;
-        while (tmp && next <= last) {
+        while (ops->has_children(cur) && next <= last) {
 
                 /* collect the component */
@@ -177 +177 @@
 
                 /* match the component */
-                while (tmp && !ops->match(cur, tmp, component))
-                        tmp = ops->sibling_get(tmp);
+                tmp = ops->match(cur, component);
 
                 /* handle miss: match amongst siblings */
@@ -229 +228 @@
                 par = cur;
                 cur = tmp;
-                tmp = ops->child_get(tmp);
         }
 
         /* handle miss: excessive components */
-        if (!tmp && next <= last) {
+        if (!ops->has_children(cur) && next <= last) {
                 if (lflag & (L_CREATE | L_LINK)) {
                         if (!ops->is_directory(cur)) {

uspace/lib/libfs/libfs.h

@@ -43 +43 @@
 
 typedef struct {
-        bool (* match)(void *, void *, const char *);
+        void * (* match)(void *, const char *);
         void * (* node_get)(fs_handle_t, dev_handle_t, fs_index_t);
         void * (* create)(int);
@@ -52 +52 @@
         size_t (* size_get)(void *);
         unsigned (* lnkcnt_get)(void *);
-        void *(* child_get)(void *);
-        void *(* sibling_get)(void *);
+        bool (* has_children)(void *);
         void *(* root_get)(void);
         char (* plb_get_char)(unsigned pos);