diff options
Diffstat (limited to 'firmware/common')
-rw-r--r-- | firmware/common/dircache.c | 11 | ||||
-rw-r--r-- | firmware/common/filefuncs.c | 37 | ||||
-rw-r--r-- | firmware/common/rbpaths.c | 84 | ||||
-rw-r--r-- | firmware/common/unicode.c | 4 |
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; | |||
88 | */ | 88 | */ |
89 | static int open_dircache_file(unsigned flags, int permissions) | 89 | static int open_dircache_file(unsigned flags, int permissions) |
90 | { | 90 | { |
91 | char path[MAX_PATH]; | ||
92 | const char *file = get_user_file_path(DIRCACHE_FILE, IS_FILE|NEED_WRITE, | ||
93 | path, sizeof(path)); | ||
91 | if (permissions != 0) | 94 | if (permissions != 0) |
92 | return open(DIRCACHE_FILE, flags, permissions); | 95 | return open(file, flags, permissions); |
93 | 96 | ||
94 | return open(DIRCACHE_FILE, flags); | 97 | return open(file, flags); |
95 | } | 98 | } |
96 | 99 | ||
97 | /** | 100 | /** |
@@ -99,7 +102,9 @@ static int open_dircache_file(unsigned flags, int permissions) | |||
99 | */ | 102 | */ |
100 | static int remove_dircache_file(void) | 103 | static int remove_dircache_file(void) |
101 | { | 104 | { |
102 | return remove(DIRCACHE_FILE); | 105 | char path[MAX_PATH]; |
106 | return remove(get_user_file_path(DIRCACHE_FILE, IS_FILE|NEED_WRITE, | ||
107 | path, sizeof(path))); | ||
103 | } | 108 | } |
104 | #endif | 109 | #endif |
105 | /** | 110 | /** |
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 @@ | |||
22 | #include "dir.h" | 22 | #include "dir.h" |
23 | #include "stdlib.h" | 23 | #include "stdlib.h" |
24 | #include "string.h" | 24 | #include "string.h" |
25 | #include "debug.h" | ||
25 | 26 | ||
26 | #ifdef HAVE_MULTIVOLUME | 27 | #ifdef HAVE_MULTIVOLUME |
27 | /* returns on which volume this is, and copies the reduced name | 28 | /* returns on which volume this is, and copies the reduced name |
@@ -50,3 +51,39 @@ int strip_volume(const char* name, char* namecopy) | |||
50 | return volume; | 51 | return volume; |
51 | } | 52 | } |
52 | #endif /* #ifdef HAVE_MULTIVOLUME */ | 53 | #endif /* #ifdef HAVE_MULTIVOLUME */ |
54 | |||
55 | #ifndef __PCTOOL__ | ||
56 | /* Test file existence, using dircache of possible */ | ||
57 | bool file_exists(const char *file) | ||
58 | { | ||
59 | int fd; | ||
60 | |||
61 | #ifdef DEBUG | ||
62 | if (!file || strlen(file) <= 0) | ||
63 | { | ||
64 | DEBUGF("%s(): Invalid parameter!\n"); | ||
65 | return false; | ||
66 | } | ||
67 | #endif | ||
68 | |||
69 | #ifdef HAVE_DIRCACHE | ||
70 | if (dircache_is_enabled()) | ||
71 | return (dircache_get_entry_ptr(file) != NULL); | ||
72 | #endif | ||
73 | |||
74 | fd = open(file, O_RDONLY); | ||
75 | if (fd < 0) | ||
76 | return false; | ||
77 | close(fd); | ||
78 | return true; | ||
79 | } | ||
80 | |||
81 | bool dir_exists(const char *path) | ||
82 | { | ||
83 | DIR* d = opendir(path); | ||
84 | if (!d) | ||
85 | return false; | ||
86 | closedir(d); | ||
87 | return true; | ||
88 | } | ||
89 | #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 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2010 Thomas Martitz | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | |||
23 | #include <stdio.h> /* snprintf */ | ||
24 | #include <stdlib.h> | ||
25 | #include "rbpaths.h" | ||
26 | #include "file.h" /* MAX_PATH */ | ||
27 | #include "dir.h" | ||
28 | #include "gcc_extensions.h" | ||
29 | #include "string-extra.h" | ||
30 | #include "filefuncs.h" | ||
31 | |||
32 | |||
33 | void paths_init(void) | ||
34 | { | ||
35 | /* make sure $HOME/.config/rockbox.org exists, it's needed for config.cfg */ | ||
36 | char home_path[MAX_PATH]; | ||
37 | snprintf(home_path, sizeof(home_path), "%s/.config/rockbox.org", getenv("HOME")); | ||
38 | mkdir(home_path); | ||
39 | } | ||
40 | |||
41 | const char* get_user_file_path(const char *path, | ||
42 | unsigned flags, | ||
43 | char* buf, | ||
44 | const size_t bufsize) | ||
45 | { | ||
46 | const char *ret = path; | ||
47 | const char *pos = path; | ||
48 | printf("%s(): looking for %s\n", __func__, path); | ||
49 | /* replace ROCKBOX_DIR in path with $HOME/.config/rockbox.org */ | ||
50 | pos += ROCKBOX_DIR_LEN; | ||
51 | if (*pos == '/') pos += 1; | ||
52 | |||
53 | if (snprintf(buf, bufsize, "%s/.config/rockbox.org/%s", getenv("HOME"), pos) | ||
54 | >= (int)bufsize) | ||
55 | return NULL; | ||
56 | |||
57 | /* always return the replacement buffer (pointing to $HOME) if | ||
58 | * write access is needed */ | ||
59 | if (flags & NEED_WRITE) | ||
60 | ret = buf; | ||
61 | else | ||
62 | { | ||
63 | if (flags & IS_FILE) | ||
64 | { | ||
65 | if (file_exists(buf)) | ||
66 | ret = buf; | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | if (dir_exists(buf)) | ||
71 | ret = buf; | ||
72 | } | ||
73 | } | ||
74 | |||
75 | /* make a copy if we're about to return the path*/ | ||
76 | if (UNLIKELY((flags & FORCE_BUFFER_COPY) && (ret != buf))) | ||
77 | { | ||
78 | strlcpy(buf, ret, bufsize); | ||
79 | ret = buf; | ||
80 | } | ||
81 | |||
82 | printf("%s(): %s\n", __func__, ret); | ||
83 | return ret; | ||
84 | } | ||
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 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <stdio.h> | 29 | #include <stdio.h> |
30 | #include "config.h" | ||
30 | #include "file.h" | 31 | #include "file.h" |
31 | #include "debug.h" | 32 | #include "debug.h" |
32 | #include "rbunicode.h" | 33 | #include "rbunicode.h" |
33 | #include "config.h" | 34 | #include "rbpaths.h" |
34 | 35 | ||
35 | #ifndef O_BINARY | 36 | #ifndef O_BINARY |
36 | #define O_BINARY 0 | 37 | #define O_BINARY 0 |
37 | #endif | 38 | #endif |
38 | 39 | ||
39 | #define CODEPAGE_DIR ROCKBOX_DIR"/codepages" | ||
40 | static int default_codepage = 0; | 40 | static int default_codepage = 0; |
41 | static int loaded_cp_table = 0; | 41 | static int loaded_cp_table = 0; |
42 | 42 | ||