diff options
author | Thomas Jarosch <tomj@simonv.com> | 2011-02-25 14:31:26 +0000 |
---|---|---|
committer | Thomas Jarosch <tomj@simonv.com> | 2011-02-25 14:31:26 +0000 |
commit | 70e48bf66dc76636743bfbee3e1b567d588db185 (patch) | |
tree | d14e337cf637bbe6c0b7d20d24948dc80a36a17d /firmware | |
parent | 89952213bb4364a32c7da42ee5092d655e5c0ccb (diff) | |
download | rockbox-70e48bf66dc76636743bfbee3e1b567d588db185.tar.gz rockbox-70e48bf66dc76636743bfbee3e1b567d588db185.zip |
RaaA: Create full config directory tree during initialization
Also robustify against unset HOME environment var.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29397 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/common/rbpaths.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/firmware/common/rbpaths.c b/firmware/common/rbpaths.c index 8eebc1fe08..10fceb69d9 100644 --- a/firmware/common/rbpaths.c +++ b/firmware/common/rbpaths.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <stdarg.h> | 25 | #include <stdarg.h> |
26 | #include "rbpaths.h" | 26 | #include "rbpaths.h" |
27 | #include "file.h" /* MAX_PATH */ | 27 | #include "file.h" /* MAX_PATH */ |
28 | #include "logf.h" | ||
28 | #include "gcc_extensions.h" | 29 | #include "gcc_extensions.h" |
29 | #include "string-extra.h" | 30 | #include "string-extra.h" |
30 | #include "filefuncs.h" | 31 | #include "filefuncs.h" |
@@ -70,9 +71,19 @@ void paths_init(void) | |||
70 | #if (CONFIG_PLATFORM & PLATFORM_ANDROID) | 71 | #if (CONFIG_PLATFORM & PLATFORM_ANDROID) |
71 | mkdir("/sdcard/rockbox"); | 72 | mkdir("/sdcard/rockbox"); |
72 | #else | 73 | #else |
73 | char home_path[MAX_PATH]; | 74 | char config_dir[MAX_PATH]; |
74 | snprintf(home_path, sizeof(home_path), "%s/.config/rockbox.org", getenv("HOME")); | 75 | |
75 | mkdir(home_path); | 76 | const char *home = getenv("HOME"); |
77 | if (!home) | ||
78 | { | ||
79 | logf("HOME environment var not set. Can't write config"); | ||
80 | return; | ||
81 | } | ||
82 | |||
83 | snprintf(config_dir, sizeof(config_dir), "%s/.config", home); | ||
84 | mkdir(config_dir); | ||
85 | snprintf(config_dir, sizeof(config_dir), "%s/.config/rockbox.org", home); | ||
86 | mkdir(config_dir); | ||
76 | #endif | 87 | #endif |
77 | } | 88 | } |
78 | 89 | ||