summaryrefslogtreecommitdiff
path: root/firmware/target/hosted
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/hosted')
-rw-r--r--firmware/target/hosted/filesystem-app.c4
-rw-r--r--firmware/target/hosted/filesystem-hosted.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c
index 7ef8d3109b..a4730a07d9 100644
--- a/firmware/target/hosted/filesystem-app.c
+++ b/firmware/target/hosted/filesystem-app.c
@@ -69,7 +69,7 @@ static const char *handle_special_links(const char* link, unsigned flags,
69{ 69{
70 (void) flags; 70 (void) flags;
71 char vol_string[VOL_MAX_LEN + 1]; 71 char vol_string[VOL_MAX_LEN + 1];
72 get_volume_name(-1, vol_string); 72 int len = get_volume_name(-1, vol_string);
73 73
74 /* link might be passed with or without HOME_DIR expanded. To handle 74 /* link might be passed with or without HOME_DIR expanded. To handle
75 * both perform substring matching (VOL_NAMES is unique enough) */ 75 * both perform substring matching (VOL_NAMES is unique enough) */
@@ -354,7 +354,7 @@ DIR * app_opendir(const char *dirname)
354 354
355#ifdef HAVE_MULTIDRIVE 355#ifdef HAVE_MULTIDRIVE
356 this->volumes_returned = INT_MAX; /* assume NOT $HOME */ 356 this->volumes_returned = INT_MAX; /* assume NOT $HOME */
357 if (rbhome_fildes >= 0 && os_samefile(rbhome_fildes, fd) > 0) 357 if (rbhome_fildes >= 0 && os_fsamefile(rbhome_fildes, this->osfd) > 0)
358 this->volumes_returned = 0; /* there's no place like $HOME */ 358 this->volumes_returned = 0; /* there's no place like $HOME */
359#endif /* HAVE_MULTIDRIVE */ 359#endif /* HAVE_MULTIDRIVE */
360 360
diff --git a/firmware/target/hosted/filesystem-hosted.h b/firmware/target/hosted/filesystem-hosted.h
index 3d979eb19d..5147ef6db6 100644
--- a/firmware/target/hosted/filesystem-hosted.h
+++ b/firmware/target/hosted/filesystem-hosted.h
@@ -63,6 +63,7 @@ bool os_file_exists(const char *ospath);
63#define _FILESYSTEM_HOSTED__DIR_H_ 63#define _FILESYSTEM_HOSTED__DIR_H_
64 64
65#ifndef OSFUNCTIONS_DECLARED 65#ifndef OSFUNCTIONS_DECLARED
66int os_opendirfd(const char *osdirname);
66int os_opendir_and_fd(const char *osdirname, OS_DIR_T **osdirpp, 67int os_opendir_and_fd(const char *osdirname, OS_DIR_T **osdirpp,
67 int *osfdp); 68 int *osfdp);
68 69