diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2017-01-16 07:23:09 -0500 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2017-01-16 07:30:39 -0500 |
commit | 4f7fea2addf4a5bc7c301e78f53d9080eaf43fb6 (patch) | |
tree | 6b72c005607b8d4cda9b7c599716eec391fe43a9 | |
parent | 16d1788356e82c639302a884437341e039574822 (diff) | |
download | rockbox-4f7fea2addf4a5bc7c301e78f53d9080eaf43fb6.tar.gz rockbox-4f7fea2addf4a5bc7c301e78f53d9080eaf43fb6.zip |
Fix path handling snafu for CheckWPS tool
Somehow it got hooked to simulator file functions when it should
be (and was) using raw OS functions.
Credit: Frank Gevaerts
Change-Id: Iac02fed1067830a432183632a047e00dfd03d3c2
-rw-r--r-- | firmware/include/dir.h | 4 | ||||
-rw-r--r-- | firmware/include/file.h | 4 | ||||
-rw-r--r-- | tools/checkwps/SOURCES | 8 | ||||
-rw-r--r-- | tools/checkwps/checkwps.c | 1 | ||||
-rw-r--r-- | tools/database/SOURCES | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/firmware/include/dir.h b/firmware/include/dir.h index f7719823a9..2f78b11cf5 100644 --- a/firmware/include/dir.h +++ b/firmware/include/dir.h | |||
@@ -27,9 +27,9 @@ | |||
27 | #include "config.h" | 27 | #include "config.h" |
28 | #include "fs_attr.h" | 28 | #include "fs_attr.h" |
29 | 29 | ||
30 | #if defined (APPLICATION) | 30 | #if defined (APPLICATION) || defined(CHECKWPS) |
31 | #include "filesystem-app.h" | 31 | #include "filesystem-app.h" |
32 | #elif defined(SIMULATOR) || defined(__PCTOOL__) | 32 | #elif defined(SIMULATOR) || defined(DBTOOL) |
33 | #include "../../uisimulator/common/filesystem-sim.h" | 33 | #include "../../uisimulator/common/filesystem-sim.h" |
34 | #else | 34 | #else |
35 | #include "filesystem-native.h" | 35 | #include "filesystem-native.h" |
diff --git a/firmware/include/file.h b/firmware/include/file.h index 8e5bacec0e..040f48dfc5 100644 --- a/firmware/include/file.h +++ b/firmware/include/file.h | |||
@@ -42,9 +42,9 @@ enum relate_result | |||
42 | RELATE_PREFIX, /* the path2 contains path1 as a prefix */ | 42 | RELATE_PREFIX, /* the path2 contains path1 as a prefix */ |
43 | }; | 43 | }; |
44 | 44 | ||
45 | #if defined(APPLICATION) | 45 | #if defined(APPLICATION) || defined(CHECKWPS) |
46 | #include "filesystem-app.h" | 46 | #include "filesystem-app.h" |
47 | #elif defined(SIMULATOR) || defined(__PCTOOL__) | 47 | #elif defined(SIMULATOR) || defined(DBTOOL) |
48 | #include "../../uisimulator/common/filesystem-sim.h" | 48 | #include "../../uisimulator/common/filesystem-sim.h" |
49 | #else | 49 | #else |
50 | #include "filesystem-native.h" | 50 | #include "filesystem-native.h" |
diff --git a/tools/checkwps/SOURCES b/tools/checkwps/SOURCES index 425e8de7b9..3a406d1b29 100644 --- a/tools/checkwps/SOURCES +++ b/tools/checkwps/SOURCES | |||
@@ -6,12 +6,12 @@ | |||
6 | ../../firmware/common/strlcpy.c | 6 | ../../firmware/common/strlcpy.c |
7 | ../../firmware/common/pathfuncs.c | 7 | ../../firmware/common/pathfuncs.c |
8 | ../../firmware/asm/mempcpy.c | 8 | ../../firmware/asm/mempcpy.c |
9 | #ifdef WIN32 | ||
10 | ../../firmware/target/hosted/filesystem-win32.c | ||
11 | #else /* !WIN32 */ | ||
9 | ../../firmware/target/hosted/filesystem-unix.c | 12 | ../../firmware/target/hosted/filesystem-unix.c |
10 | #ifdef APPLICATION | 13 | #endif /* WIN32 */ |
11 | ../../firmware/target/hosted/filesystem-app.c | 14 | ../../firmware/target/hosted/filesystem-app.c |
12 | #else | ||
13 | ../../uisimulator/common/filesystem-sim.c | ||
14 | #endif | ||
15 | #ifdef DEBUG | 15 | #ifdef DEBUG |
16 | ../../firmware/debug.c | 16 | ../../firmware/debug.c |
17 | #endif | 17 | #endif |
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c index c2cadc7444..1948c208fd 100644 --- a/tools/checkwps/checkwps.c +++ b/tools/checkwps/checkwps.c | |||
@@ -39,7 +39,6 @@ bool debug_wps = true; | |||
39 | int wps_verbose_level = 0; | 39 | int wps_verbose_level = 0; |
40 | char *skin_buffer; | 40 | char *skin_buffer; |
41 | 41 | ||
42 | const char *sim_root_dir = "."; | ||
43 | const struct settings_list *settings; | 42 | const struct settings_list *settings; |
44 | const int nb_settings = 0; | 43 | const int nb_settings = 0; |
45 | 44 | ||
diff --git a/tools/database/SOURCES b/tools/database/SOURCES index 71593bba11..36d6247092 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES | |||
@@ -10,7 +10,11 @@ database.c | |||
10 | ../../firmware/common/unicode.c | 10 | ../../firmware/common/unicode.c |
11 | ../../firmware/target/hosted/debug-hosted.c | 11 | ../../firmware/target/hosted/debug-hosted.c |
12 | ../../firmware/logf.c | 12 | ../../firmware/logf.c |
13 | #ifdef WIN32 | ||
14 | ../../firmware/target/hosted/filesystem-win32.c | ||
15 | #else /* !WIN32 */ | ||
13 | ../../firmware/target/hosted/filesystem-unix.c | 16 | ../../firmware/target/hosted/filesystem-unix.c |
17 | #endif /* WIN32 */ | ||
14 | #ifdef APPLICATION | 18 | #ifdef APPLICATION |
15 | ../../firmware/target/hosted/filesystem-app.c | 19 | ../../firmware/target/hosted/filesystem-app.c |
16 | #else /* !APPLICATION */ | 20 | #else /* !APPLICATION */ |