procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve detection of pdumper file and *.eln files

Browse source 
* src/emacs.c (load_pdump_find_executable): Resolve symlinks even
if argv[0] includes leading directories.  (Bug#46790)
This commit is contained in:
Eli Zaretskii 2021-04-24 16:01:19 +03:00
parent 592ffd35b0
commit fa65c044f2
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/emacs.c
View file

@ -746,10 +746,18 @@ load_pdump_find_executable (char const *argv0, ptrdiff_t *candidate_size)
char *candidate = NULL;
/* If the executable name contains a slash, we have some kind of
path already, so just copy it. */
path already, so just resolve symlinks and return the result. */
eassert (argv0);
if (strchr (argv0, DIRECTORY_SEP))
{
char *real_name = realpath (argv0, NULL);
if (real_name)
{
*candidate_size = strlen (real_name) + 1;
return real_name;
}
char *val = xstrdup (argv0);
*candidate_size = strlen (val) + 1;
return val;