mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-18 08:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor current directory removal

Browse source
This commit is contained in:
Arun Prakash Jana 2019-10-19 08:43:32 +05:30
parent ae7a3fbdc1
commit 864273dd9b
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/nnn.c
View file

@ -2971,6 +2971,34 @@ static char *visit_parent(char *path, char *newpath, int *presel)
return dir;
}
static void find_accessible_parent(char *path, char *newpath, char *lastname, int *presel)
{
char *dir;
/* 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);
mvprintw(xlines - 1, 0, "cannot access dir\n");
xdelay();
}
static bool execute_file(int cur, char *path, char *newpath, int *presel)
{
if (!ndents)
@ -3870,30 +3898,8 @@ nochange:
/* If CWD is deleted or moved or perms changed, find an accessible parent */
if (access(path, F_OK)) {
DPRINTF_S("directory inaccessible");
/* 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);
find_accessible_parent(path, newpath, lastname, &presel);
setdirwatch();
mvprintw(xlines - 1, 0, "cannot access directory\n");
xdelay();
goto begin;
}