Get rid of get_user_file_path and do the path handling in wrappers for open() and friends.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28752 a1c6a512-1295-4272-9138-f99709370657

10 files changed, 230 insertions, 106 deletions

diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index 509743bdbb..e8a5e7cbb1 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -89,13 +89,10 @@ static int fdbind_idx = 0;
  */
 static int open_dircache_file(unsigned flags, int permissions)
 {
-    char path[MAX_PATH];
-    const char *file = get_user_file_path(DIRCACHE_FILE, IS_FILE|NEED_WRITE,
-                                path, sizeof(path));
     if (permissions != 0)
-        return open(file, flags, permissions);
+        return open(DIRCACHE_FILE, flags, permissions);
 
-    return open(file, flags);
+    return open(DIRCACHE_FILE, flags);
 }
 
 /**
@@ -103,9 +100,7 @@ static int open_dircache_file(unsigned flags, int permissions)
  */
 static int remove_dircache_file(void)
 {
-    char path[MAX_PATH];
-    return remove(get_user_file_path(DIRCACHE_FILE, IS_FILE|NEED_WRITE,
-                                path, sizeof(path)));
+    return remove(DIRCACHE_FILE);
 }
 #endif
 /** 
diff --git a/firmware/common/rbpaths.c b/firmware/common/rbpaths.c
index b63586c9f4..50d6ccf6ec 100644
--- a/firmware/common/rbpaths.c
+++ b/firmware/common/rbpaths.c
@@ -22,13 +22,47 @@
 
 #include <stdio.h> /* snprintf */
 #include <stdlib.h>
+#include <stdarg.h>
 #include "rbpaths.h"
 #include "file.h" /* MAX_PATH */
-#include "dir.h"
 #include "gcc_extensions.h"
 #include "string-extra.h"
 #include "filefuncs.h"
 
+#undef open
+#undef creat
+#undef remove
+#undef rename
+#undef opendir
+#undef mkdir
+#undef rmdir
+
+#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
+#include "dir-target.h"
+#define opendir opendir_android
+#define mkdir   mkdir_android
+#define rmdir   rmdir_android
+#elif (CONFIG_PLATFORM & PLATFORM_SDL)
+#define open    sim_open
+#define remove  sim_remove
+#define rename  sim_rename
+#define opendir sim_opendir
+#define mkdir   sim_mkdir
+#define rmdir   sim_rmdir
+extern int sim_open(const char* name, int o, ...);
+extern int sim_remove(const char* name);
+extern int sim_rename(const char* old, const char* new);
+extern DIR* sim_opendir(const char* name);
+extern int sim_mkdir(const char* name);
+extern int sim_rmdir(const char* name);
+#endif
+
+/* flags for get_user_file_path() */
+/* whether you need write access to that file/dir, especially true
+ * for runtime generated files (config.cfg) */
+#define NEED_WRITE          (1<<0)
+/* file or directory? */
+#define IS_FILE             (1<<1)
 
 void paths_init(void)
 {
@@ -42,14 +76,28 @@ void paths_init(void)
 #endif
 }
 
-const char* get_user_file_path(const char *path,
-                               unsigned flags,
-                               char* buf,
-                               const size_t bufsize)
+static bool try_path(const char* filename, unsigned flags)
+{
+    if (flags & IS_FILE)
+    {
+        if (file_exists(filename))
+            return true;
+    }
+    else
+    {
+        if (dir_exists(filename))
+            return true;
+    }
+    return false;
+}
+
+static const char* _get_user_file_path(const char *path,
+                                       unsigned flags,
+                                       char* buf,
+                                       const size_t bufsize)
 {
     const char *ret = path;
     const char *pos = path;
-    printf("%s(): looking for %s\n", __func__, path);
     /* replace ROCKBOX_DIR in path with $HOME/.config/rockbox.org */
     pos += ROCKBOX_DIR_LEN;
     if (*pos == '/') pos += 1;
@@ -66,27 +114,99 @@ const char* get_user_file_path(const char *path,
      * write access is needed */
     if (flags & NEED_WRITE)
         ret = buf;
-    else
+    else if (try_path(buf, flags))
+        ret = buf;
+        
+    if (ret != buf) /* not found in $HOME, try ROCKBOX_BASE_DIR, !NEED_WRITE only */
     {
-        if (flags & IS_FILE)
-        {
-            if (file_exists(buf))
-                ret = buf;
-        }
-        else
-        {
-            if (dir_exists(buf))
-                ret = buf;
-        }
+        if (snprintf(buf, bufsize, ROCKBOX_SHARE_PATH "/%s", pos) >= (int)bufsize)
+            return NULL;
+
+        if (try_path(buf, flags))
+            ret = buf;
     }
 
-    /* make a copy if we're about to return the path*/
-    if (UNLIKELY((flags & FORCE_BUFFER_COPY) && (ret != buf)))
+    return ret;
+}
+
+int app_open(const char *name, int o, ...)
+{
+    char realpath[MAX_PATH];
+    va_list ap;
+    int fd;
+    
+    if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
     {
-        strlcpy(buf, ret, bufsize);
-        ret = buf;
+        int flags = IS_FILE;
+        if (o & (O_CREAT|O_RDWR|O_TRUNC|O_WRONLY))
+            flags |= NEED_WRITE;
+        name = _get_user_file_path(name, flags, realpath, sizeof(realpath));
     }
+    va_start(ap, o);
+    fd = open(name, o, ap);
+    va_end(ap);
+    
+    return fd;
+    
+}
 
-    printf("%s(): %s\n", __func__, ret);
-    return ret;
+int app_creat(const char* name, mode_t mode)
+{
+    return app_open(name, O_CREAT|O_WRONLY|O_TRUNC, mode);
 }
+
+int app_remove(const char *name)
+{
+    char realpath[MAX_PATH];
+    const char *fname = name;
+    if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
+    {
+        fname = _get_user_file_path(name, 0, realpath, sizeof(realpath));
+    }
+    return remove(fname);
+}
+
+int app_rename(const char *old, const char *new)
+{
+    char realpath[MAX_PATH];
+    const char *fname = old;
+    if (!strncmp(ROCKBOX_DIR, old, ROCKBOX_DIR_LEN))
+    {
+        fname = _get_user_file_path(old, 0, realpath, sizeof(realpath));
+    }
+    return rename(fname, new);
+}
+
+DIR *app_opendir(const char *name)
+{
+    char realpath[MAX_PATH];
+    const char *fname = name;
+    if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
+    {
+        fname = _get_user_file_path(name, 0, realpath, sizeof(realpath));
+    }
+    return opendir(fname);
+}
+
+int app_mkdir(const char* name)
+{
+    char realpath[MAX_PATH];
+    const char *fname = name;
+    if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
+    {
+        fname = _get_user_file_path(name, 0, realpath, sizeof(realpath));
+    }
+    return mkdir(fname);
+}
+
+int app_rmdir(const char* name)
+{
+    char realpath[MAX_PATH];
+    const char *fname = name;
+    if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
+    {
+        fname = _get_user_file_path(name, 0, realpath, sizeof(realpath));
+    }
+    return rmdir(fname);
+}
+
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index cd87888cef..6c5d769ed8 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -26,17 +26,6 @@
 #include "autoconf.h"
 #include "string-extra.h"
 
-/* flags for get_user_file_path() */
-/* whether you need write access to that file/dir, especially true
- * for runtime generated files (config.cfg) */
-#define NEED_WRITE          (1<<0)
-/* file or directory? */
-#define IS_FILE             (1<<1)
-/* make sure the path is copied into the passed buffer (it may return
- * the passed path directly otherwise, e.g. always on target builds) */
-#define FORCE_BUFFER_COPY   (1<<2)
-
-
 
 /* name of directory where configuration, fonts and other data
  * files are stored */
@@ -67,35 +56,17 @@
 #define REC_BASE_DIR        "/"
 #define PLAYLIST_CATALOG_DEFAULT_DIR "/Playlists"
 
-#ifndef PLUGIN
-static inline __attribute__((always_inline)) const char* get_user_file_path(const char *path,
-                               unsigned flags,
-                               char* buf,
-                               const size_t bufsize)
-{
-    if (flags & FORCE_BUFFER_COPY)
-    {
-        strlcpy(buf, path, bufsize);
-        return buf;
-    }
-    return path;
-}
-#endif
-
 #define paths_init()
 #else /* application */
 
-#define PLUGIN_DIR          ROCKBOX_LIBRARY_PATH "/rockbox/rocks"
-#define CODECS_DIR          ROCKBOX_LIBRARY_PATH "/rockbox/codecs"
+#define PLUGIN_DIR          ROCKBOX_LIBRARY_PATH "/rocks"
+#define CODECS_DIR          ROCKBOX_LIBRARY_PATH "/codecs"
 
 #define REC_BASE_DIR        ROCKBOX_DIR  "/"
 #define PLAYLIST_CATALOG_DEFAULT_DIR ROCKBOX_DIR "/Playlists"
 
 extern void paths_init(void);
-extern const char* get_user_file_path(const char *path,
-                               unsigned flags,
-                               char* buf,
-                               const size_t bufsize);
+
 #endif /* APPLICATION */
 
 #define LANG_DIR            ROCKBOX_DIR "/langs"
diff --git a/firmware/font.c b/firmware/font.c
index e973108bca..cd74459b1e 100644
--- a/firmware/font.c
+++ b/firmware/font.c
@@ -613,11 +613,7 @@ void glyph_cache_save(struct font* pf)
         pf = &font_ui;
     if (pf->fd >= 0 && pf == &font_ui) 
     {
-        char path[MAX_PATH];
-        const char *file = get_user_file_path(GLYPH_CACHE_FILE, IS_FILE|NEED_WRITE,
-                                       path, sizeof(path));
-
-        cache_fd = open(file, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+        cache_fd = open(GLYPH_CACHE_FILE, O_WRONLY|O_CREAT|O_TRUNC, 0666);
         if (cache_fd < 0)
             return;
 
@@ -678,7 +674,6 @@ static void glyph_cache_load(struct font* pf)
         int i, size;
         unsigned char tmp[2];
         unsigned short ch;
-        char path[MAX_PATH];
         unsigned short glyphs[MAX_SORT];
         unsigned short glyphs_lru_order[MAX_SORT];
         int glyph_file_skip=0, glyph_file_size=0;
@@ -687,8 +682,7 @@ static void glyph_cache_load(struct font* pf)
         if ( sort_size > MAX_SORT )
              sort_size = MAX_SORT;
 
-        fd = open(get_user_file_path(GLYPH_CACHE_FILE, IS_FILE|NEED_WRITE,
-                                     path, sizeof(path)), O_RDONLY|O_BINARY);
+        fd = open(GLYPH_CACHE_FILE, O_RDONLY|O_BINARY);
         if (fd >= 0) {
             
             /* only read what fits */
diff --git a/firmware/include/dir.h b/firmware/include/dir.h
index 29dcb65961..3a582c3865 100644
--- a/firmware/include/dir.h
+++ b/firmware/include/dir.h
@@ -49,7 +49,6 @@
 #define ATTR_ARCHIVE     0x20
 #define ATTR_VOLUME      0x40 /* this is a volume, not a real directory */
 
-#if (CONFIG_PLATFORM & (PLATFORM_NATIVE|PLATFORM_SDL))
 #ifdef HAVE_DIRCACHE
 # include "dircache.h"
 # define DIR DIR_CACHED
@@ -61,7 +60,7 @@
 # define mkdir mkdir_cached
 # define rmdir rmdir_cached
 #else
-#include "dir_uncached.h"
+# include "dir_uncached.h"
 # define DIR DIR_UNCACHED
 # define dirent dirent_uncached
 # define opendir opendir_uncached
@@ -71,9 +70,5 @@
 # define mkdir mkdir_uncached
 # define rmdir rmdir_uncached
 #endif
-#else
-#include "dir-target.h"
-#include "dir_uncached.h"
-#endif
 
 #endif
diff --git a/firmware/include/dir_uncached.h b/firmware/include/dir_uncached.h
index 29512c7a69..3bae07177b 100644
--- a/firmware/include/dir_uncached.h
+++ b/firmware/include/dir_uncached.h
@@ -34,13 +34,13 @@ struct dirinfo {
 #include "file.h"
 
 #if (CONFIG_PLATFORM & PLATFORM_SDL)
-#define dirent_uncached sim_dirent
-#define DIR_UNCACHED SIM_DIR
-#define opendir_uncached sim_opendir
-#define readdir_uncached sim_readdir
-#define closedir_uncached sim_closedir
-#define mkdir_uncached sim_mkdir
-#define rmdir_uncached sim_rmdir
+#   define dirent_uncached sim_dirent
+#   define DIR_UNCACHED SIM_DIR
+#   define opendir_uncached sim_opendir
+#   define readdir_uncached sim_readdir
+#   define closedir_uncached sim_closedir
+#   define mkdir_uncached sim_mkdir
+#   define rmdir_uncached sim_rmdir
 #endif
 
 #ifndef DIRENT_DEFINED
@@ -54,6 +54,7 @@ struct dirent_uncached {
 
 #include "fat.h"
 
+#ifndef DIR_DEFINED
 typedef struct {
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     bool busy;
@@ -69,6 +70,24 @@ typedef struct {
     char *name;
 #endif
 } DIR_UNCACHED;
+#endif
+
+
+#if defined(APPLICATION)
+#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
+#include "dir-target.h"
+#endif
+# undef opendir_uncached
+# define opendir_uncached app_opendir
+# undef mkdir_uncached
+# define mkdir_uncached app_mkdir
+# undef rmdir_uncached
+# define rmdir_uncached app_rmdir
+/* defined in rbpaths.c */
+extern DIR_UNCACHED* app_opendir(const char* name);
+extern int app_rmdir(const char* name);
+extern int app_mkdir(const char* name);
+#endif
 
 #ifdef HAVE_HOTSWAP
 char *get_volume_name(int volume);
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 8711124391..ee52c3f2b7 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -37,20 +37,38 @@
 #define MAX_OPEN_FILES 11
 
 #if !defined(PLUGIN) && !defined(CODEC)
-#if (CONFIG_PLATFORM & PLATFORM_SDL)
-#define open(x, ...) sim_open(x, __VA_ARGS__)
-#define creat(x,m) sim_creat(x,m)
-#define remove(x) sim_remove(x)
-#define rename(x,y) sim_rename(x,y)
-#define filesize(x) sim_filesize(x)
-#define fsync(x) sim_fsync(x)
-#define ftruncate(x,y) sim_ftruncate(x,y)
-#define lseek(x,y,z) sim_lseek(x,y,z)
-#define read(x,y,z) sim_read(x,y,z)
-#define write(x,y,z) sim_write(x,y,z)
-#define close(x) sim_close(x)
-extern int sim_creat(const char *pathname, mode_t mode);
-extern int sim_open(const char *pathname, int flags, ...);
+#if defined(APPLICATION)
+#   define open(x, ...)    app_open(x, __VA_ARGS__)
+#   define creat(x,m)      app_creat(x, m)
+#   define remove(x)       app_remove(x)
+#   define rename(x,y)     app_rename(x,y)
+extern int app_open(const char *name, int o, ...);
+extern int app_creat(const char *name, mode_t mode);
+extern int app_remove(const char* pathname);
+extern int app_rename(const char* path, const char* newname);
+#   if (CONFIG_PLATFORM & PLATFORM_SDL)
+#   define filesize(x) sim_filesize(x)
+#   define fsync(x) sim_fsync(x)
+#   define ftruncate(x,y) sim_ftruncate(x,y)
+#   define lseek(x,y,z) sim_lseek(x,y,z)
+#   define read(x,y,z) sim_read(x,y,z)
+#   define write(x,y,z) sim_write(x,y,z)
+#   define close(x) sim_close(x)
+#   endif
+#elif defined(SIMULATOR)
+#   define open(x, ...) sim_open(x, __VA_ARGS__)
+#   define creat(x,m) sim_creat(x,m)
+#   define remove(x) sim_remove(x)
+#   define rename(x,y) sim_rename(x,y)
+#   define filesize(x) sim_filesize(x)
+#   define fsync(x) sim_fsync(x)
+#   define ftruncate(x,y) sim_ftruncate(x,y)
+#   define lseek(x,y,z) sim_lseek(x,y,z)
+#   define read(x,y,z) sim_read(x,y,z)
+#   define write(x,y,z) sim_write(x,y,z)
+#   define close(x) sim_close(x)
+extern int sim_open(const char *name, int o, ...);
+extern int sim_creat(const char *name, mode_t mode);
 #endif
 
 typedef int (*open_func)(const char* pathname, int flags, ...);
diff --git a/firmware/load_code.c b/firmware/load_code.c
index 5b5307e622..2337ee5cad 100644
--- a/firmware/load_code.c
+++ b/firmware/load_code.c
@@ -144,17 +144,15 @@ void *lc_open_from_mem(void *addr, size_t blob_size)
     for (i = 0; i < 10; i++)
     {
 #if (CONFIG_PLATFORM & PLATFORM_ANDROID)
-        /* we need that path fixed, since get_user_file_path()
+        /* we need that path fixed, since _get_user_file_path()
          * gives us the folder on the sdcard where we cannot load libraries
          * from (no exec permissions)
          */
         snprintf(temp_filename, sizeof(temp_filename),
                  "/data/data/org.rockbox/app_rockbox/libtemp_binary_%d.so", i);
 #else
-        char name[MAX_PATH];
-        const char *_name = get_user_file_path(ROCKBOX_DIR, NEED_WRITE, name, sizeof(name));
         snprintf(temp_filename, sizeof(temp_filename),
-                 "%s/libtemp_binary_%d.dll", _name, i);
+                 ROCKBOX_DIR "/libtemp_binary_%d.dll", i);
 #endif
         fd = open(temp_filename, O_WRONLY|O_CREAT|O_TRUNC, 0700);
         if (fd >= 0)
diff --git a/firmware/target/hosted/android/dir-target.h b/firmware/target/hosted/android/dir-target.h
index c93d92caad..c6c6b4b2b0 100644
--- a/firmware/target/hosted/android/dir-target.h
+++ b/firmware/target/hosted/android/dir-target.h
@@ -24,10 +24,21 @@
 
 #include <dirent.h>
 
-#define opendir     _opendir
-#define mkdir       _mkdir
-#define closedir    _closedir
-#define readdir     _readdir
+#define dirent_uncached dirent
+#define DIR_UNCACHED DIR
+#define opendir_uncached _opendir
+#define readdir_uncached _readdir
+#define closedir_uncached _closedir
+#define mkdir_uncached _mkdir
+#define rmdir_uncached rmdir
+
+#define dirent_android dirent
+#define DIR_android DIR
+#define opendir_android _opendir
+#define readdir_android _readdir
+#define closedir_android _closedir
+#define mkdir_android _mkdir
+#define rmdir_android rmdir
 
 extern DIR* _opendir(const char* name);
 extern int  _mkdir(const char* name);
@@ -36,5 +47,7 @@ extern struct dirent *_readdir(DIR* dir);
 extern void fat_size(unsigned long *size, unsigned long *free);
 
 #define DIRFUNCTIONS_DEFINED
+#define DIRENT_DEFINED
+#define DIR_DEFINED
 
 #endif /* __DIR_TARGET_H__ */
diff --git a/firmware/target/hosted/android/fs-android.c b/firmware/target/hosted/android/fs-android.c
index 5209458e54..1967198d3d 100644
--- a/firmware/target/hosted/android/fs-android.c
+++ b/firmware/target/hosted/android/fs-android.c
@@ -29,6 +29,7 @@
 #include "dir-target.h"
 #include "file.h"
 #include "dir.h"
+#include "rbpaths.h"
 
 
 long filesize(int fd)