summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2017-01-16 07:23:09 -0500
committerMichael Sevakis <jethead71@rockbox.org>2017-01-16 07:30:39 -0500
commit4f7fea2addf4a5bc7c301e78f53d9080eaf43fb6 (patch)
tree6b72c005607b8d4cda9b7c599716eec391fe43a9
parent16d1788356e82c639302a884437341e039574822 (diff)
downloadrockbox-4f7fea2.tar.gz
rockbox-4f7fea2.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.h4
-rw-r--r--firmware/include/file.h4
-rw-r--r--tools/checkwps/SOURCES8
-rw-r--r--tools/checkwps/checkwps.c1
-rw-r--r--tools/database/SOURCES4
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 @@
#include "config.h"
#include "fs_attr.h"
-#if defined (APPLICATION)
+#if defined (APPLICATION) || defined(CHECKWPS)
#include "filesystem-app.h"
-#elif defined(SIMULATOR) || defined(__PCTOOL__)
+#elif defined(SIMULATOR) || defined(DBTOOL)
#include "../../uisimulator/common/filesystem-sim.h"
#else
#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
RELATE_PREFIX, /* the path2 contains path1 as a prefix */
};
-#if defined(APPLICATION)
+#if defined(APPLICATION) || defined(CHECKWPS)
#include "filesystem-app.h"
-#elif defined(SIMULATOR) || defined(__PCTOOL__)
+#elif defined(SIMULATOR) || defined(DBTOOL)
#include "../../uisimulator/common/filesystem-sim.h"
#else
#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 @@
../../firmware/common/strlcpy.c
../../firmware/common/pathfuncs.c
../../firmware/asm/mempcpy.c
+#ifdef WIN32
+../../firmware/target/hosted/filesystem-win32.c
+#else /* !WIN32 */
../../firmware/target/hosted/filesystem-unix.c
-#ifdef APPLICATION
+#endif /* WIN32 */
../../firmware/target/hosted/filesystem-app.c
-#else
-../../uisimulator/common/filesystem-sim.c
-#endif
#ifdef DEBUG
../../firmware/debug.c
#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;
int wps_verbose_level = 0;
char *skin_buffer;
-const char *sim_root_dir = ".";
const struct settings_list *settings;
const int nb_settings = 0;
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
../../firmware/common/unicode.c
../../firmware/target/hosted/debug-hosted.c
../../firmware/logf.c
+#ifdef WIN32
+../../firmware/target/hosted/filesystem-win32.c
+#else /* !WIN32 */
../../firmware/target/hosted/filesystem-unix.c
+#endif /* WIN32 */
#ifdef APPLICATION
../../firmware/target/hosted/filesystem-app.c
#else /* !APPLICATION */