mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00
Code Issues Projects Releases Wiki Activity

Fix listing of Android root directory when it is accessible

Browse source 
* src/androidvfs.c (android_root_closedir, android_root_dirfd)
(android_root_opendir): Allocate an ersatz file descriptor even
if directory is non-NULL, so that at-funcs will properly return
file status for virtual files in the root directory.
This commit is contained in:
Po Lu 2024-04-01 09:26:03 +08:00
parent 09f381d70d
commit 0cf9b58228
1 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/androidvfs.c
View file

@ -6730,7 +6730,8 @@ android_root_closedir (struct android_vdir *vdir)
if (dir->directory)
closedir (dir->directory);
else if (root_fd_references--)
if (root_fd_references--)
;
else
{
@ -6745,13 +6746,7 @@ android_root_closedir (struct android_vdir *vdir)
static int
android_root_dirfd (struct android_vdir *vdir)
{
struct android_unix_vdir *dir;
dir = (struct android_unix_vdir *) vdir;
if (dir->directory)
return dirfd (dir->directory);
eassert (root_fd != -1);
return root_fd;
}
@ -6778,13 +6773,13 @@ android_root_opendir (struct android_vnode *vnode)
dir->directory = directory;
dir->index = 0;
if (!directory)
{
/* Allocate a temporary file descriptor for this ersatz root. */
if (root_fd < 0)
root_fd = open ("/dev/null", O_RDONLY | O_CLOEXEC);
root_fd_references++;
}
/* Allocate a temporary file descriptor for this ersatz root. This is
required regardless of the value of DIRECTORY, as android_fstatat
and co. will not defer to the VFS layer if a directory file
descriptor is not known to be special. */
if (root_fd < 0)
root_fd = open ("/dev/null", O_RDONLY | O_CLOEXEC);
root_fd_references++;
return &dir->vdir;
}