mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1773 from 7ocb/handle-link-by-readlink-not-realpath-mk2 

When handling bookmark, use readlink, not realpath
This commit is contained in:
Arun 2023-11-25 18:34:01 +05:30 committed by GitHub
parent 485079d3ec 9aaf9491ad
commit 404eed5fc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nnn.c
View File

@ -1310,6 +1310,18 @@ static char *abspath(const char *filepath, char *cwd, char *buf)
return resolved_path;
}
/* finds abspath of link pointed by filepath, taking cwd into account */
static char *bmtarget(const char *filepath, char *cwd, char *buf)
{
char target[PATH_MAX + 1];
ssize_t n = readlink(filepath, target, PATH_MAX);
if (n != -1) {
target[n] = '\0';
return abspath(target, cwd, buf);
}
return NULL;
}
/* wraps the argument in single quotes so it can be safely fed to shell */
static bool shell_escape(char *output, size_t outlen, const char *s)
{
@ -7053,7 +7065,7 @@ nochange:
pent = &pdents[cur];
if (!g_state.selbm || !(S_ISLNK(pent->mode) &&
realpath(pent->name, newpath) &&
bmtarget(pent->name, path, newpath) &&
xstrsncpy(path, lastdir, PATH_MAX)))
mkpath(path, pent->name, newpath);
g_state.selbm = 0;