Changeset 438f355 in mainline

Timestamp:

2017-04-02T21:24:22Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ca7506f

Parents:

c23275a

Message:

Move mtab emulation to its own file

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• generic/vfs/mtab.c (added)
• generic/vfs/vfs.c (modified) (2 diffs)
• include/vfs/vfs.h (modified) (1 diff)
• include/vfs/vfs_mtab.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -149 +149 @@
         generic/udebug.c \
         generic/vfs/canonify.c \
+        generic/vfs/inbox.c \
+        generic/vfs/mtab.c \
         generic/vfs/vfs.c \
         generic/rcu.c \
         generic/setjmp.c \
-        generic/vfs/inbox.c \
         generic/stack.c \
         generic/stacktrace.c \

uspace/lib/c/generic/vfs/vfs.c

@@ -33 +33 @@
  */
 
+#include <vfs/vfs.h>
 #include <vfs/canonify.h>
-#include <vfs/vfs.h>
 #include <vfs/vfs_mtab.h>
 #include <vfs/vfs_sess.h>
 #include <macros.h>
 #include <stdlib.h>
-#include <dirent.h>
 #include <sys/types.h>
 #include <ipc/services.h>
@@ -882 +881 @@
 }
 
-static void process_mp(const char *path, struct stat *stat, list_t *mtab_list)
-{
-        mtab_ent_t *ent;
-
-        ent = (mtab_ent_t *) malloc(sizeof(mtab_ent_t));
-        if (!ent)
-                return;
-
-        link_initialize(&ent->link);
-        str_cpy(ent->mp, sizeof(ent->mp), path);
-        ent->service_id = stat->service_id;
-
-        struct statfs stfs;
-        if (vfs_statfs_path(path, &stfs) == EOK)
-                str_cpy(ent->fs_name, sizeof(ent->fs_name), stfs.fs_name);
-        else
-                str_cpy(ent->fs_name, sizeof(ent->fs_name), "?");
-        
-        list_append(&ent->link, mtab_list);
-}
-
-static int vfs_get_mtab_visit(const char *path, list_t *mtab_list,
-    fs_handle_t fs_handle, service_id_t service_id)
-{
-        DIR *dir;
-        struct dirent *dirent;
-
-        dir = opendir(path);
-        if (!dir)
-                return ENOENT;
-
-        while ((dirent = readdir(dir)) != NULL) {
-                char *child;
-                struct stat st;
-                int rc;
-
-                rc = asprintf(&child, "%s/%s", path, dirent->d_name);
-                if (rc < 0) {
-                        closedir(dir);
-                        return rc;
-                }
-
-                char *pa = vfs_absolutize(child, NULL);
-                if (!pa) {
-                        free(child);
-                        closedir(dir);
-                        return ENOMEM;
-                }
-
-                free(child);
-                child = pa;
-
-                rc = vfs_stat_path(child, &st);
-                if (rc != 0) {
-                        free(child);
-                        closedir(dir);
-                        return rc;
-                }
-
-                if (st.fs_handle != fs_handle || st.service_id != service_id) {
-                        /*
-                         * We have discovered a mountpoint.
-                         */
-                        process_mp(child, &st, mtab_list);
-                }
-
-                if (st.is_directory) {
-                        (void) vfs_get_mtab_visit(child, mtab_list,
-                            st.fs_handle, st.service_id);
-                }
-
-                free(child);
-        }
-
-        closedir(dir);
-        return EOK;
-}
-
-int vfs_get_mtab_list(list_t *mtab_list)
-{
-        struct stat st;
-
-        int rc = vfs_stat_path("/", &st);
-        if (rc != 0)
-                return rc;
-
-        process_mp("/", &st, mtab_list);
-
-        return vfs_get_mtab_visit("/", mtab_list, st.fs_handle, st.service_id);
-}
-
 /** Get filesystem statistics.
  *

uspace/lib/c/include/vfs/vfs.h

@@ -79 +79 @@
 extern int vfs_fhandle(FILE *, int *);
 
-extern int vfs_get_mtab_list(list_t *mtab_list);
-
 extern async_exch_t *vfs_exchange_begin(void);
 extern void vfs_exchange_end(async_exch_t *);

uspace/lib/c/include/vfs/vfs_mtab.h

@@ -47 +47 @@
 } mtab_ent_t;
 
+extern int vfs_get_mtab_list(list_t *);
+
 #endif