readdir_r use in tagcache.check_dir, ft_load

Change-Id: Ibcde39ed247e100dd47ae877fb2a3625bbb38d8b

3 files changed, 80 insertions, 11 deletions

diff --git a/firmware/common/dir.c b/firmware/common/dir.c
index 9a78d910a7..27af5f7fca 100644
--- a/firmware/common/dir.c
+++ b/firmware/common/dir.c
@@ -159,6 +159,7 @@ file_error:
     return rc;
 }
 
+#if 0
 /* read a directory */
 struct dirent * readdir(DIR *dirp)
 {
@@ -182,23 +183,19 @@ file_error:
 
     return res;
 }
+#endif
 
-#if 0 /* not included now but probably should be */
-/* read a directory (reentrant) */
-int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
+/* readdir, readdir_r common fn */
+static int readdir_common(DIR *dirp, struct dirent *entry, struct dirent **result)
 {
-    if (!result)
-        FILE_ERROR_RETURN(EFAULT, -2);
-
-    *result = NULL;
-
-    if (!entry)
-        FILE_ERROR_RETURN(EFAULT, -3);
-
+    *result = NULL; /* we checked for validity before calling, yes? */
     struct dirstr_desc * const dir = GET_DIRSTR(READER, dirp);
     if (!dir)
         FILE_ERROR_RETURN(ERRNO, -1);
 
+    if (!entry)
+        entry = &dir->entry;
+
     int rc = ns_readdir_dirent(&dir->stream, &dir->scan, entry);
     if (rc < 0)
         FILE_ERROR(EIO, rc * 10 - 4);
@@ -218,6 +215,27 @@ file_error:
     return rc;
 }
 
+/* read a directory */
+struct dirent * readdir(DIR *dirp)
+{
+    struct dirent *entry;
+    readdir_common(dirp, NULL, &entry);
+    return entry;
+}
+
+/* read a directory (reentrant) */
+int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
+{
+    if (!result)
+        FILE_ERROR_RETURN(EFAULT, -2);
+    *result = NULL;
+    if (!entry)
+        FILE_ERROR_RETURN(EFAULT, -3);
+    return readdir_common(dirp, entry, result);
+}
+
+
+#if 0 /* not included now but probably should be */
 /* reset the position of a directory stream to the beginning of a directory */
 void rewinddir(DIR *dirp)
 {
diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c
index 7d59a174dc..fc4fff0eb5 100644
--- a/firmware/target/hosted/filesystem-app.c
+++ b/firmware/target/hosted/filesystem-app.c
@@ -453,6 +453,56 @@ struct dirent * app_readdir(DIR *dirp)
     return (struct dirent *)osdirent;
 }
 
+/* read a directory (reentrant) */
+int app_readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
+{
+    struct __dir *this = (struct __dir *)dirp;
+    if (!this)
+        FILE_ERROR_RETURN(EBADF, -6);
+
+    if (!result)
+        FILE_ERROR_RETURN(EFAULT, -2);
+
+    *result = NULL;
+
+    if (!entry)
+        FILE_ERROR_RETURN(EFAULT, -3);
+
+#ifdef HAVE_MULTIDRIVE
+    if (this->volumes_returned < NUM_VOLUMES)
+    {
+        while (++this->volumes_returned < NUM_VOLUMES)
+        {
+            if (!volume_present(this->volumes_returned))
+                continue;
+
+            get_volume_name(this->volumes_returned, entry->d_name);
+            *result = entry;
+            return 0;
+        }
+    }
+    /* do normal directory reads */
+#endif /* HAVE_MULTIDRIVE */
+
+    OS_DIRENT_T *osdirent = os_readdir(this->osdirp);
+    if (!osdirent)
+        FILE_ERROR_RETURN(ERRNO, -4);
+#ifdef OS_DIRENT_CONVERT
+    size_t name_size = sizeof (entry->d_name);
+    if (strlcpy_from_os(entry->d_name, osdirent->d_name,
+                        name_size) >= name_size)
+    {
+        entry->d_name[0] = '\0';
+        errno = EOVERFLOW;
+        FILE_ERROR_RETURN(ENAMETOOLONG, -5);
+    }
+
+    *result = entry;
+#endif /* OS_DIRENT_CONVERT */
+
+    return 0;
+}
+
 int app_mkdir(const char *path)
 {
     char realpath[MAX_PATH];
diff --git a/firmware/target/hosted/filesystem-app.h b/firmware/target/hosted/filesystem-app.h
index b35b63e95f..2d7d6e817d 100644
--- a/firmware/target/hosted/filesystem-app.h
+++ b/firmware/target/hosted/filesystem-app.h
@@ -107,6 +107,7 @@ ssize_t app_readlink(const char *path, char *buf, size_t bufsize);
 #ifndef DIRFUNCTIONS_DECLARED
 DIR * app_opendir(const char *dirname);
 struct dirent * app_readdir(DIR *dirp);
+int   app_readdir_r(DIR *dirp, struct dirent* entry, struct dirent **result);
 int   app_closedir(DIR *dirp);
 int   app_mkdir(const char *path);
 int   app_rmdir(const char *path);