mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-02-26 11:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not resolve symlinks in argument PATH

Browse source
This commit is contained in:
Arun Prakash Jana 2021-08-10 06:48:21 +05:30
parent 1df63a78e4
commit 59d90aa2ce
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nnn.c
View file

@ -1162,12 +1162,18 @@ static char *common_prefix(const char *path, char *prefix)
/* /*
* The library function realpath() resolves symlinks. * The library function realpath() resolves symlinks.
* If there's a symlink in file list we want to show the symlink not what it's points to. * If there's a symlink in file list we want to show the symlink not what it's points to.
* Resolves ./../~ in path
*/ */
static char *abspath(const char *path, const char *cwd, char *buf) static char *abspath(const char *path, const char *cwd, char *buf)
{ {
if (!path) if (!path)
return NULL; return NULL;
if (path[0] == '~')
cwd = home;
else if ((path[0] != '/') && !cwd)
cwd = getcwd(NULL, 0);
size_t dst_size = 0, src_size = xstrlen(path), cwd_size = cwd ? xstrlen(cwd) : 0; size_t dst_size = 0, src_size = xstrlen(path), cwd_size = cwd ? xstrlen(cwd) : 0;
size_t len = src_size; size_t len = src_size;
const char *src; const char *src;
@ -1177,7 +1183,7 @@ static char *abspath(const char *path, const char *cwd, char *buf)
* ./ (find .) * ./ (find .)
* no separator (fd .): this needs an additional char for '/' * no separator (fd .): this needs an additional char for '/'
*/ */
char *resolved_path = buf ? buf : malloc(src_size + (*path == '/' ? 0 : cwd_size) + 2); char *resolved_path = buf ? buf : malloc(src_size + cwd_size + 2);
if (!resolved_path) if (!resolved_path)
return NULL; return NULL;
@ -8164,7 +8170,7 @@ int main(int argc, char *argv[])
} }
close(fd); close(fd);
selpath = realpath(optarg, NULL); selpath = abspath(optarg, NULL, NULL);
unlink(selpath); unlink(selpath);
} }
break; break;
@ -8308,7 +8314,7 @@ int main(int argc, char *argv[])
DPRINTF_S(arg); DPRINTF_S(arg);
if (xstrlen(arg) > 7 && is_prefix(arg, "file://", 7)) if (xstrlen(arg) > 7 && is_prefix(arg, "file://", 7))
arg = arg + 7; arg = arg + 7;
initpath = realpath(arg, NULL); initpath = abspath(arg, NULL, NULL);
DPRINTF_S(initpath); DPRINTF_S(initpath);
if (!initpath) { if (!initpath) {
xerror(); xerror();