Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dbtool: More fixes to dbtool operation

Browse source 
Now properly treats current directory as "/"

Change-Id: I54357a65f2fda7d2cfb56ff18a044ae10b87bbce
This commit is contained in:
Solomon Peachy 2023-05-25 16:03:33 -04:00
parent e803daae0a
commit 8bc7ba5d22
3 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
firmware/target/hosted/filesystem-app.c
View file

@ -43,6 +43,10 @@
#undef PIVOT_ROOT #undef PIVOT_ROOT
#endif #endif
#if defined(DBTOOL)
#define PIVOT_ROOT "."
#endif
#if defined(__PCTOOL__) #if defined(__PCTOOL__)
/* We don't want this for tools */ /* We don't want this for tools */
#undef HAVE_SPECIAL_DIRS #undef HAVE_SPECIAL_DIRS
@ -222,7 +226,7 @@ const char * handle_special_dirs(const char *dir, unsigned flags,
#define PIVOT_ROOT_LEN (sizeof(PIVOT_ROOT)-1) #define PIVOT_ROOT_LEN (sizeof(PIVOT_ROOT)-1)
/* Prepend root prefix to find actual path */ /* Prepend root prefix to find actual path */
if (strncmp(PIVOT_ROOT, dir, PIVOT_ROOT_LEN) if (strncmp(PIVOT_ROOT, dir, PIVOT_ROOT_LEN)
#ifdef MULTIDRIVE_DIR #if defined(MULTIDRIVE_DIR) && defined(MULTIDRIVE_DIR_LEN)
/* Unless it's a MULTIDRIVE dir, in which case use as-is */ /* Unless it's a MULTIDRIVE dir, in which case use as-is */
&& strncmp(MULTIDRIVE_DIR, dir, MULTIDRIVE_DIR_LEN) && strncmp(MULTIDRIVE_DIR, dir, MULTIDRIVE_DIR_LEN)
#endif #endif

2
tools/configure vendored
View file

@ -4270,7 +4270,7 @@ fi
simcc "database-sdl" simcc "database-sdl"
toolset=''; toolset='';
appsdir='$(ROOTDIR)/tools/database'; appsdir='$(ROOTDIR)/tools/database';
rbdir="./.rockbox"
case $uname in case $uname in
CYGWIN*|MINGW*) CYGWIN*|MINGW*)
output="database_${modelname}.exe" output="database_${modelname}.exe"

35
tools/database/database.c
View file

@ -23,41 +23,10 @@ int main(int argc, char **argv)
/* / is actually ., will get translated in io.c /* / is actually ., will get translated in io.c
* (with the help of sim_root_dir below */ * (with the help of sim_root_dir below */
const char *paths[] = { "./", NULL }; const char *paths[] = { "/", NULL };
tagcache_init(); tagcache_init();
do_tagcache_build(paths); do_tagcache_build(paths);
tagcache_reverse_scan(); tagcache_reverse_scan();
return 0; return 0;
} }
/* needed for io.c */
const char *sim_root_dir = ".";
/* stubs to avoid including thread-sdl.c */
#include "kernel.h"
void mutex_init(struct mutex *m)
{
(void)m;
}
void mutex_lock(struct mutex *m)
{
(void)m;
}
void mutex_unlock(struct mutex *m)
{
(void)m;
}
void sim_thread_lock(void *me)
{
(void)me;
}
void * sim_thread_unlock(void)
{
return (void*)1;
}