nnn

commit 59d90aa2ce9fb6ed4a12212fd61fc428d5f277e0
parent 1df63a78e473ced06d6628217fcf62aa85d9157a
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date:   Tue, 10 Aug 2021 06:48:21 +0530

Do not resolve symlinks in argument PATH

Diffstat:
M
src/nnn.c
 | 
12
+++++++++---

1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/nnn.c b/src/nnn.c
@@ -1162,12 +1162,18 @@ static char *common_prefix(const char *path, char *prefix)
 /*
  * 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.
+ * Resolves ./../~ in path
  */
 static char *abspath(const char *path, const char *cwd, char *buf)
 {
 	if (!path)
 		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 len = src_size;
 	const char *src;
@@ -1177,7 +1183,7 @@ static char *abspath(const char *path, const char *cwd, char *buf)
 	 * ./ (find .)
 	 * 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)
 		return NULL;
@@ -8164,7 +8170,7 @@ int main(int argc, char *argv[])
 				}
 
 				close(fd);
-				selpath = realpath(optarg, NULL);
+				selpath = abspath(optarg, NULL, NULL);
 				unlink(selpath);
 			}
 			break;
@@ -8308,7 +8314,7 @@ int main(int argc, char *argv[])
 			DPRINTF_S(arg);
 			if (xstrlen(arg) > 7 && is_prefix(arg, "file://", 7))
 				arg = arg + 7;
-			initpath = realpath(arg, NULL);
+			initpath = abspath(arg, NULL, NULL);
 			DPRINTF_S(initpath);
 			if (!initpath) {
 				xerror();