Allow mounting of any directory as the root directory.

Provide definitions for the macros:
* RB_ROOT_VOL_HIDDEN(v) to exclude certain items from the root.
* RB_ROOT_CONTENTS to return a string with the name of the
directory to mount in the root.

Defaults are in export/rbpaths.h

It's a bit much for those that don't need the full functionality.
Some conditional define can cut it back a lot to cut out things only
needed if alternate root mounts are required. I'm just not bothering
yet. The basic concept would be applied to all targets to keep file
code from forking too much.

Change-Id: I90b5c0a1c949283d3102c16734b0b6ac73901a30

1 files changed, 12 insertions, 80 deletions

diff --git a/firmware/common/dir.c b/firmware/common/dir.c
index f89129ae34..85e6ff316b 100644
--- a/firmware/common/dir.c
+++ b/firmware/common/dir.c
@@ -27,17 +27,14 @@
 #include "dir.h"
 #include "pathfuncs.h"
 #include "fileobj_mgr.h"
-#include "dircache_redirect.h"
+#include "rb_namespace.h"
 
 /* structure used for open directory streams */
 static struct dirstr_desc
 {
     struct filestr_base stream; /* basic stream info (first!) */
-    struct dirscan_info scan;   /* directory scan cursor */
+    struct ns_scan_info scan;   /* directory scan cursor */
     struct dirent       entry;  /* current parsed entry information */
-#ifdef HAVE_MULTIVOLUME
-    int                 volumecounter; /* counter for root volume entries */
-#endif
 } open_streams[MAX_OPEN_DIRS];
 
 /* check and return a struct dirstr_desc* from a DIR* */
@@ -47,7 +44,7 @@ static struct dirstr_desc * get_dirstr(DIR *dirp)
 
     if (!PTR_IN_ARRAY(open_streams, dir, MAX_OPEN_DIRS))
         dir = NULL;
-    else if (dir->stream.flags & FDO_BUSY)
+    else if (dir->stream.flags & (FDO_BUSY|FD_VALID))
         return dir;
 
     int errnum;
@@ -104,49 +101,6 @@ static struct dirstr_desc * alloc_dirstr(void)
     return NULL;
 }
 
-#ifdef HAVE_MULTIVOLUME
-static int readdir_volume_inner(struct dirstr_desc *dir, struct dirent *entry)
-{
-    /* Volumes (secondary file systems) get inserted into the system root
-     * directory. If the path specified volume 0, enumeration will not
-     * include other volumes, but just its own files and directories.
-     *
-     * Fake special directories, which don't really exist, that will get
-     * redirected upon opendir()
-     */
-    while (++dir->volumecounter < NUM_VOLUMES)
-    {
-        /* on the system root */
-        if (!fat_ismounted(dir->volumecounter))
-            continue;
-
-        get_volume_name(dir->volumecounter, entry->d_name);
-        dir->entry.info.attr    = ATTR_MOUNT_POINT;
-        dir->entry.info.size    = 0;
-        dir->entry.info.wrtdate = 0;
-        dir->entry.info.wrttime = 0;
-        return 1;
-    }
-
-    /* do normal directory entry fetching */
-    return 0;
-}
-#endif /* HAVE_MULTIVOLUME */
-
-static inline int readdir_volume(struct dirstr_desc *dir,
-                                 struct dirent *entry)
-{
-#ifdef HAVE_MULTIVOLUME
-    /* fetch virtual volume entries? */
-    if (dir->volumecounter < NUM_VOLUMES)
-        return readdir_volume_inner(dir, entry);
-#endif /* HAVE_MULTIVOLUME */
-
-    /* do normal directory entry fetching */
-    return 0;
-    (void)dir; (void)entry;
-}
-
 
 /** POSIX interface **/
 
@@ -165,21 +119,13 @@ DIR * opendir(const char *dirname)
     if (!dir)
         FILE_ERROR(EMFILE, RC);
 
-    rc = open_stream_internal(dirname, FF_DIR, &dir->stream, NULL);
+    rc = ns_open_stream(dirname, FF_DIR, &dir->stream, &dir->scan);
     if (rc < 0)
     {
         DEBUGF("Open failed: %d\n", rc);
         FILE_ERROR(ERRNO, RC);
     }
 
-#ifdef HAVE_MULTIVOLUME
-    /* volume counter is relevant only to the system root */
-    dir->volumecounter = rc > 1 ? 0 : INT_MAX;
-#endif /* HAVE_MULTIVOLUME */
-
-    fat_rewind(&dir->stream.fatstr);
-    rewinddir_dirent(&dir->scan);
-
     dirp = (DIR *)dir;
 file_error:
     file_internal_unlock_WRITER();
@@ -204,7 +150,7 @@ int closedir(DIR *dirp)
         FILE_ERROR(EBADF, -2);
     }
 
-    rc = close_stream_internal(&dir->stream);
+    rc = ns_close_stream(&dir->stream);
     if (rc < 0)
         FILE_ERROR(ERRNO, rc * 10 - 3);
 
@@ -222,16 +168,11 @@ struct dirent * readdir(DIR *dirp)
 
     struct dirent *res = NULL;
 
-    int rc = readdir_volume(dir, &dir->entry);
-    if (rc == 0)
-    {
-        rc = readdir_dirent(&dir->stream, &dir->scan, &dir->entry);
-        if (rc < 0)
-            FILE_ERROR(EIO, RC);
-    }
-
+    int rc = ns_readdir_dirent(&dir->stream, &dir->scan, &dir->entry);
     if (rc > 0)
         res = &dir->entry;
+    else if (rc < 0)
+        FILE_ERROR(EIO, RC);
 
 file_error:
     RELEASE_DIRSTR(READER, dir);
@@ -258,13 +199,9 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
     if (!dir)
         FILE_ERROR_RETURN(ERRNO, -1);
 
-    int rc = readdir_volume(dir, entry);
-    if (rc == 0)
-    {
-        rc = readdir_dirent(&dir->stream, &dir->scan, entry);
-        if (rc < 0)
-            FILE_ERROR(EIO, rc * 10 - 4);
-    }
+    int rc = ns_readdir_dirent(&dir->stream, &dir->scan, entry);
+    if (rc < 0)
+        FILE_ERROR(EIO, rc * 10 - 4);
 
 file_error:
     RELEASE_DIRSTR(READER, dir);
@@ -288,12 +225,7 @@ void rewinddir(DIR *dirp)
     if (!dir)
         FILE_ERROR_RETURN(ERRNO);
 
-    rewinddir_dirent(&dir->scan);
-
-#ifdef HAVE_MULTIVOLUME
-    if (dir->volumecounter != INT_MAX)
-        dir->volumecounter = 0;
-#endif /* HAVE_MULTIVOLUME */
+    ns_dirscan_rewind(&dir->scan);
 
     RELEASE_DIRSTR(READER, dir);
 }