len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "readdir_r use in tagcache.check_dir, ft_load"

Browse source 
This reverts commit 0c737d3b2e.

Reason for revert: Not really a concern as open_stream returns an independent buffer since g#566

Change-Id: Idbd2f4a7cc2ea6362b7714629469eeb7b3d19b3b
This commit is contained in:
William Wilgus 2024-05-02 13:38:32 -04:00
parent 0c737d3b2e
commit efcea66280
7 changed files with 24 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -453,56 +453,6 @@ 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];

1
firmware/target/hosted/filesystem-app.h
View file

@ -107,7 +107,6 @@ 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);