From f3d60aea34de60c4371c04fa1b8482ca71a64b53 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 29 Aug 2014 23:36:11 -0400 Subject: Hopefully fix most of the errors and warnings from the last push Change-Id: I1a466b2d55f120796910039a0296ca324c58e891 --- firmware/target/hosted/filesystem-app.c | 4 ++-- firmware/target/hosted/filesystem-hosted.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'firmware/target/hosted') 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, { (void) flags; char vol_string[VOL_MAX_LEN + 1]; - get_volume_name(-1, vol_string); + int len = get_volume_name(-1, vol_string); /* link might be passed with or without HOME_DIR expanded. To handle * both perform substring matching (VOL_NAMES is unique enough) */ @@ -354,7 +354,7 @@ DIR * app_opendir(const char *dirname) #ifdef HAVE_MULTIDRIVE this->volumes_returned = INT_MAX; /* assume NOT $HOME */ - if (rbhome_fildes >= 0 && os_samefile(rbhome_fildes, fd) > 0) + if (rbhome_fildes >= 0 && os_fsamefile(rbhome_fildes, this->osfd) > 0) this->volumes_returned = 0; /* there's no place like $HOME */ #endif /* HAVE_MULTIDRIVE */ 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); #define _FILESYSTEM_HOSTED__DIR_H_ #ifndef OSFUNCTIONS_DECLARED +int os_opendirfd(const char *osdirname); int os_opendir_and_fd(const char *osdirname, OS_DIR_T **osdirpp, int *osfdp); -- cgit v1.2.3