nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Michael Sevakis 2017-01-16 07:23:09 -05:00
parent 16d1788356
commit 4f7fea2add
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/include/dir.h
View File

@ -27,9 +27,9 @@
#include "config.h" #include "config.h"
#include "fs_attr.h" #include "fs_attr.h"
#if defined (APPLICATION) #if defined (APPLICATION) || defined(CHECKWPS)
#include "filesystem-app.h" #include "filesystem-app.h"
#elif defined(SIMULATOR) || defined(__PCTOOL__) #elif defined(SIMULATOR) || defined(DBTOOL)
#include "../../uisimulator/common/filesystem-sim.h" #include "../../uisimulator/common/filesystem-sim.h"
#else #else
#include "filesystem-native.h" #include "filesystem-native.h"

4
firmware/include/file.h
View File

@ -42,9 +42,9 @@ enum relate_result
RELATE_PREFIX, /* the path2 contains path1 as a prefix */ RELATE_PREFIX, /* the path2 contains path1 as a prefix */
}; };
#if defined(APPLICATION) #if defined(APPLICATION) || defined(CHECKWPS)
#include "filesystem-app.h" #include "filesystem-app.h"
#elif defined(SIMULATOR) || defined(__PCTOOL__) #elif defined(SIMULATOR) || defined(DBTOOL)
#include "../../uisimulator/common/filesystem-sim.h" #include "../../uisimulator/common/filesystem-sim.h"
#else #else
#include "filesystem-native.h" #include "filesystem-native.h"

8
tools/checkwps/SOURCES
View File

@ -6,12 +6,12 @@
../../firmware/common/strlcpy.c ../../firmware/common/strlcpy.c
../../firmware/common/pathfuncs.c ../../firmware/common/pathfuncs.c
../../firmware/asm/mempcpy.c ../../firmware/asm/mempcpy.c
#ifdef WIN32
../../firmware/target/hosted/filesystem-win32.c
#else /* !WIN32 */
../../firmware/target/hosted/filesystem-unix.c ../../firmware/target/hosted/filesystem-unix.c
#ifdef APPLICATION #endif /* WIN32 */
../../firmware/target/hosted/filesystem-app.c ../../firmware/target/hosted/filesystem-app.c
#else
../../uisimulator/common/filesystem-sim.c
#endif
#ifdef DEBUG #ifdef DEBUG
../../firmware/debug.c ../../firmware/debug.c
#endif #endif

1
tools/checkwps/checkwps.c
View File

@ -39,7 +39,6 @@ bool debug_wps = true;
int wps_verbose_level = 0; int wps_verbose_level = 0;
char *skin_buffer; char *skin_buffer;
const char *sim_root_dir = ".";
const struct settings_list *settings; const struct settings_list *settings;
const int nb_settings = 0; const int nb_settings = 0;

4
tools/database/SOURCES
View File

@ -10,7 +10,11 @@ database.c
../../firmware/common/unicode.c ../../firmware/common/unicode.c
../../firmware/target/hosted/debug-hosted.c ../../firmware/target/hosted/debug-hosted.c
../../firmware/logf.c ../../firmware/logf.c
#ifdef WIN32
../../firmware/target/hosted/filesystem-win32.c
#else /* !WIN32 */
../../firmware/target/hosted/filesystem-unix.c ../../firmware/target/hosted/filesystem-unix.c
#endif /* WIN32 */
#ifdef APPLICATION #ifdef APPLICATION
../../firmware/target/hosted/filesystem-app.c ../../firmware/target/hosted/filesystem-app.c
#else /* !APPLICATION */ #else /* !APPLICATION */