emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix `openp' for some manners of invocations on Android

Browse source 
* src/lread.c (openp) [USE_ANDROID_ASSETS]: Don't write file
name to *STOREPTR if NULL and call SAFE_FREE before yielding
platform file descriptor.
This commit is contained in:
Po Lu 2026-08-17 20:01:57 +08:00
parent c4e17d50f9
commit 7fe7a2635b
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/lread.c
View file

@ -1950,8 +1950,16 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
if (platform_fd.asset
&& platform_fd.asset != (void *) -1)
{
*storeptr = string;
goto handle_platform_fd;
/* Here, openp found a platform specific
file descriptor. It can't be a directory
under Android, so return it in *PLATFORM
and then indicate this by returning -3
for the file descriptor. */
if (storeptr)
*storeptr = string;
*platform = platform_fd.asset;
SAFE_FREE ();
return -3;
}
if (platform_fd.asset == (void *) -1)
@ -2030,16 +2038,6 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes,
SAFE_FREE ();
errno = last_errno;
return -1;
#ifdef USE_ANDROID_ASSETS
handle_platform_fd:
/* Here, openp found a platform specific file descriptor. It can't
be a directory under Android, so return it in *PLATFORM and then
-3 as the file descriptor. */
*platform = platform_fd.asset;
return -3;
#endif
}