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

Sansa Multiboot Root Redirect Enhance + bug fix

Browse source 
filename buffer was too small to retrieve redirect path

if redirected to sd root remove <SD1> as it is redundant

Change-Id: I1326601f1ba4a18d6bc173798759eb762b55528c
This commit is contained in:
William Wilgus 2022-03-05 09:33:45 -05:00
parent ee87bfb933
commit bc3fa53937
2 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/debug_menu.c
View file

@ -2526,20 +2526,21 @@ static bool dbg_skin_engine(void)
#if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR)
static bool dbg_boot_data(void) static bool dbg_boot_data(void)
{ {
unsigned int crc = 0; unsigned int crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
struct simplelist_info info; struct simplelist_info info;
info.scroll_all = true; info.scroll_all = true;
simplelist_info_init(&info, "Boot data", 1, NULL); simplelist_info_init(&info, "Boot data", 1, NULL);
simplelist_set_line_count(0); simplelist_set_line_count(0);
crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
#if defined(HAVE_MULTIBOOT) #if defined(HAVE_MULTIBOOT)
char rootpath[VOL_MAX_LEN+2] = RB_ROOT_CONTENTS_DIR; char rootpath[MAX_PATH / 2] = RB_ROOT_CONTENTS_DIR;
int boot_volume = 0; int boot_volume = 0;
if(crc == boot_data.crc) if(crc == boot_data.crc)
{ {
boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */ boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
get_redirect_dir(rootpath, sizeof(rootpath), boot_volume, "", ""); int rtlen = get_redirect_dir(rootpath, sizeof(rootpath), boot_volume, "", "");
rootpath[path_strip_trailing_separators(rootpath,NULL)] = '\0'; while (rtlen > 0 && rootpath[--rtlen] == PATH_SEPCH) /* remove extra separators */
rootpath[rtlen] = '\0';
} }
simplelist_addline("Boot Volume: <%lu>", boot_volume); simplelist_addline("Boot Volume: <%lu>", boot_volume);
simplelist_addline("Root:"); simplelist_addline("Root:");

58
firmware/include/dircache_redirect.h
View file

@ -138,49 +138,49 @@ static inline void fileop_onsync_internal(struct filestr_base *stream)
static inline void volume_onmount_internal(IF_MV_NONVOID(int volume)) static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
{ {
#ifdef HAVE_MULTIVOLUME
char path[VOL_MAX_LEN+2];
make_volume_root(volume, path);
#else
const char *path = PATH_ROOTSTR;
#endif
#if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR) && !defined(BOOTLOADER) #if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR) && !defined(BOOTLOADER)
static char rtpath[VOL_MAX_LEN+2] = RB_ROOT_CONTENTS_DIR; char path[VOL_MAX_LEN+2];
static bool redirected = false; char rtpath[MAX_PATH / 2];
int boot_volume = 0; make_volume_root(volume, path);
unsigned int crc = 0;
crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff); unsigned int crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
if (crc == boot_data.crc) if (crc > 0 && crc == boot_data.crc)
{ {
root_mount_path(path, 0); /*root could be different folder don't hide*/ /* we need to mount the drive before we can access it */
boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */ root_mount_path(path, 0); /* root could be different folder don't hide */
//root_mount_path(path, volume == boot_volume ? NSITEM_HIDDEN : 0);
if (!redirected && volume == boot_volume) if (volume == boot_data.boot_volume) /* boot volume contained in uint8_t payload */
{ {
if (get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "") < 0) int rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "");
{ /* Error occurred, card removed? Set root to default */ while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH)
root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS); rtpath[rtlen] = '\0'; /* remove extra separators */
}
else if (rtlen <= 0 || rtpath[rtlen] == VOL_END_TOK)
redirected = true; root_unmount_volume(volume); /* unmount so root can be hidden*/
}
if (redirected && volume == boot_volume) if (rtlen <= 0) /* Error occurred, card removed? Set root to default */
goto standard_redirect;
root_mount_path(rtpath, NSITEM_CONTENTS); root_mount_path(rtpath, NSITEM_CONTENTS);
}
} /*CRC OK*/ } /*CRC OK*/
else else
{ {
standard_redirect:
root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0); root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0);
if (volume == path_strip_volume(RB_ROOT_CONTENTS_DIR, NULL, false)) if (volume == path_strip_volume(RB_ROOT_CONTENTS_DIR, NULL, false))
root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS); root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS);
} }
#else /*ndef HAVE_MULTIBOOT */ #elif defined(HAVE_MULTIVOLUME)
char path[VOL_MAX_LEN+2];
make_volume_root(volume, path);
root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0); root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0);
#ifdef HAVE_MULTIVOLUME
if (volume == path_strip_volume(RB_ROOT_CONTENTS_DIR, NULL, false)) if (volume == path_strip_volume(RB_ROOT_CONTENTS_DIR, NULL, false))
#endif
root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS); root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS);
#else
const char *path = PATH_ROOTSTR;
root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0);
root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS);
#endif /* HAVE_MULTIBOOT */ #endif /* HAVE_MULTIBOOT */
#ifdef HAVE_DIRCACHE #ifdef HAVE_DIRCACHE