4 files changed, 131 insertions, 5 deletions

diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index 906527f8f2..7b2cdd1d75 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -88,10 +88,13 @@ 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(DIRCACHE_FILE, flags, permissions);
+        return open(file, flags, permissions);
 
-    return open(DIRCACHE_FILE, flags);
+    return open(file, flags);
 }
 
 /**
@@ -99,7 +102,9 @@ static int open_dircache_file(unsigned flags, int permissions)
  */
 static int remove_dircache_file(void)
 {
-    return remove(DIRCACHE_FILE);
+    char path[MAX_PATH];
+    return remove(get_user_file_path(DIRCACHE_FILE, IS_FILE|NEED_WRITE,
+                                path, sizeof(path)));
 }
 #endif
 /** 
diff --git a/firmware/common/filefuncs.c b/firmware/common/filefuncs.c
index ca9113250a..c058267094 100644
--- a/firmware/common/filefuncs.c
+++ b/firmware/common/filefuncs.c
@@ -22,6 +22,7 @@
 #include "dir.h"
 #include "stdlib.h"
 #include "string.h"
+#include "debug.h"
 
 #ifdef HAVE_MULTIVOLUME
 /* returns on which volume this is, and copies the reduced name
@@ -50,3 +51,39 @@ int strip_volume(const char* name, char* namecopy)
     return volume;
 }
 #endif /* #ifdef HAVE_MULTIVOLUME */
+
+#ifndef __PCTOOL__
+/* Test file existence, using dircache of possible */
+bool file_exists(const char *file)
+{
+    int fd;
+
+#ifdef DEBUG
+    if (!file || strlen(file) <= 0)
+    {
+        DEBUGF("%s(): Invalid parameter!\n");
+        return false;
+    }
+#endif
+
+#ifdef HAVE_DIRCACHE
+    if (dircache_is_enabled())
+        return (dircache_get_entry_ptr(file) != NULL);
+#endif
+
+    fd = open(file, O_RDONLY);
+    if (fd < 0)
+        return false;
+    close(fd);
+    return true;
+}
+
+bool dir_exists(const char *path)
+{
+    DIR* d = opendir(path);
+    if (!d)
+        return false;
+    closedir(d);
+    return true;
+}
+#endif /* __PCTOOL__ */
diff --git a/firmware/common/rbpaths.c b/firmware/common/rbpaths.c
new file mode 100644
index 0000000000..69bc1387ef
--- /dev/null
+++ b/firmware/common/rbpaths.c
@@ -0,0 +1,84 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 Thomas Martitz
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+
+#include <stdio.h> /* snprintf */
+#include <stdlib.h>
+#include "rbpaths.h"
+#include "file.h" /* MAX_PATH */
+#include "dir.h"
+#include "gcc_extensions.h"
+#include "string-extra.h"
+#include "filefuncs.h"
+
+
+void paths_init(void)
+{
+    /* make sure $HOME/.config/rockbox.org exists, it's needed for config.cfg */
+    char home_path[MAX_PATH];
+    snprintf(home_path, sizeof(home_path), "%s/.config/rockbox.org", getenv("HOME"));
+    mkdir(home_path);
+}
+
+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;
+
+    if (snprintf(buf, bufsize, "%s/.config/rockbox.org/%s", getenv("HOME"), pos)
+            >= (int)bufsize)
+        return NULL;
+
+    /* always return the replacement buffer (pointing to $HOME) if
+     * write access is needed */
+    if (flags & NEED_WRITE)
+        ret = buf;
+    else
+    {
+        if (flags & IS_FILE)
+        {
+            if (file_exists(buf))
+                ret = buf;
+        }
+        else
+        {
+            if (dir_exists(buf))
+                ret = buf;
+        }
+    }
+
+    /* make a copy if we're about to return the path*/
+    if (UNLIKELY((flags & FORCE_BUFFER_COPY) && (ret != buf)))
+    {
+        strlcpy(buf, ret, bufsize);
+        ret = buf;
+    }
+
+    printf("%s(): %s\n", __func__, ret);
+    return ret;
+}
diff --git a/firmware/common/unicode.c b/firmware/common/unicode.c
index 4ef6eaae2b..25d4a9129e 100644
--- a/firmware/common/unicode.c
+++ b/firmware/common/unicode.c
@@ -27,16 +27,16 @@
  */
 
 #include <stdio.h>
+#include "config.h"
 #include "file.h"
 #include "debug.h"
 #include "rbunicode.h"
-#include "config.h"
+#include "rbpaths.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
 
-#define CODEPAGE_DIR    ROCKBOX_DIR"/codepages"
 static int default_codepage = 0;
 static int loaded_cp_table = 0;