From 31d53cbb0fff48488f45ba234b8d595c31507739 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 12 Jul 2024 06:33:54 +0800 Subject: vim-patch:8.2.3388: fnamemodify('path/..', ':p') differs from using 'path/../' (#29667) Problem: fnamemodify('path/..', ':p') differs from using 'path/../'. Solution: Include the "/.." in the directory name. (closes vim/vim#8808) https://github.com/vim/vim/commit/4eaef9979fc5032606897963f1af37674ee0d422 Co-authored-by: Bram Moolenaar --- src/nvim/path.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/path.c b/src/nvim/path.c index 1643264fee..770d15e2fc 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -2385,10 +2385,14 @@ static int path_to_absolute(const char *fname, char *buf, size_t len, int force) } #endif if (p != NULL) { + if (strcmp(p + 1, "..") == 0) { + // for "/path/dir/.." include the "/.." + p += 3; + } assert(p >= fname); memcpy(relative_directory, fname, (size_t)(p - fname + 1)); relative_directory[p - fname + 1] = NUL; - end_of_path = p + 1; + end_of_path = (vim_ispathsep_nocolon(*p) ? p + 1 : p); } else { relative_directory[0] = NUL; } -- cgit