mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-10 09:59:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #305 from 0xACE/fosterhome

Browse source 
Find a parent when CWD disappears
This commit is contained in:
Mischievous Meerkat 2019-07-12 18:28:21 +05:30 committed by GitHub
parent 33062d7c6e d640de2589
commit 87d91251ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/nnn.c
View file

@ -3297,11 +3297,34 @@ nochange:
if (getppid() == 1) if (getppid() == 1)
_exit(0); _exit(0);
/* Check if CWD is deleted to avoid hang, bad idea */ /* Check if CWD is deleted and find an existing parent */
if (access(path, F_OK)) { if (access(path, F_OK)) {
DPRINTF_S("dir deleted or moved"); DPRINTF_S("dir deleted or moved");
cfg.badexit = 1;
return; /* Save history */
xstrlcpy(lastname, xbasename(path), NAME_MAX + 1);
xstrlcpy(newpath, path, PATH_MAX);
while (true) {
dir = visit_parent(path, newpath, &presel);
if (istopdir(path) || istopdir(newpath)) {
if (!dir)
dir = dirname(newpath);
break;
}
if (!dir) {
xstrlcpy(path, newpath, PATH_MAX);
continue;
}
break;
}
xstrlcpy(path, dir, PATH_MAX);
setdirwatch();
mvprintw(xlines - 1, 0, "cannot access directory\n");
xdelay();
goto begin;
} }
sel = nextsel(presel); sel = nextsel(presel);