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

Reformat copy current current file name

Browse source
This commit is contained in:
Arun Prakash Jana 2021-09-04 08:06:29 +05:30
parent 49be2cfcd1
commit 51829c8027
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/nnn.c
View file

@ -810,7 +810,7 @@ static haiku_nm_h haiku_hnd;
#define exitcurses() endwin() #define exitcurses() endwin()
#define printwarn(presel) printwait(strerror(errno), presel) #define printwarn(presel) printwait(strerror(errno), presel)
#define istopdir(path) ((path)[1] == '\0' && (path)[0] == '/') #define istopdir(path) ((path)[1] == '\0' && (path)[0] == '/')
#define copycurname() xstrsncpy(lastname, pdents[cur].name, NAME_MAX + 1) #define copycurname() xstrsncpy(lastname, ndents ? pdents[cur].name : "\0", NAME_MAX + 1)
#define settimeout() timeout(1000) #define settimeout() timeout(1000)
#define cleartimeout() timeout(-1) #define cleartimeout() timeout(-1)
#define errexit() printerr(__LINE__) #define errexit() printerr(__LINE__)
@ -3434,8 +3434,7 @@ end:
ln[REGEX_MAX - 1] = ln[1]; ln[REGEX_MAX - 1] = ln[1];
/* Save current */ /* Save current */
if (ndents) copycurname();
copycurname();
curs_set(FALSE); curs_set(FALSE);
settimeout(); settimeout();
@ -6669,9 +6668,7 @@ nochange:
/* Start watching the directory */ /* Start watching the directory */
watch = TRUE; watch = TRUE;
copycurname();
if (ndents)
copycurname();
goto begin; goto begin;
} }
@ -6716,8 +6713,7 @@ nochange:
} else { } else {
if (cfg.filtermode || filterset()) if (cfg.filtermode || filterset())
presel = FILTER; presel = FILTER;
if (ndents) copycurname();
copycurname();
goto nochange; goto nochange;
} }
#endif #endif
@ -7058,8 +7054,7 @@ nochange:
presel = FILTER; presel = FILTER;
clearfilter(); clearfilter();
} }
if (ndents) copycurname();
copycurname();
goto begin; goto begin;
case SEL_DETAIL: case SEL_DETAIL:
cfg.showdetail ^= 1; cfg.showdetail ^= 1;
@ -7146,8 +7141,7 @@ nochange:
g_state.autonext ^= 1; g_state.autonext ^= 1;
if (cfg.filtermode) if (cfg.filtermode)
presel = FILTER; presel = FILTER;
if (ndents) copycurname();
copycurname();
goto nochange; goto nochange;
case SEL_EDIT: case SEL_EDIT:
spawn(editor, newpath, NULL, NULL, F_CLI); spawn(editor, newpath, NULL, NULL, F_CLI);
@ -7166,8 +7160,7 @@ nochange:
} }
/* Save current */ /* Save current */
if (ndents) copycurname();
copycurname();
/* Repopulate as directory content may have changed */ /* Repopulate as directory content may have changed */
goto begin; goto begin;
} }
@ -7332,7 +7325,7 @@ nochange:
if (newpath[0] && !access(newpath, F_OK)) if (newpath[0] && !access(newpath, F_OK))
xstrsncpy(lastname, xbasename(newpath), NAME_MAX+1); xstrsncpy(lastname, xbasename(newpath), NAME_MAX+1);
else if (ndents) else
copycurname(); copycurname();
goto begin; goto begin;
} }
@ -7551,8 +7544,7 @@ nochange:
if (g_state.picked) if (g_state.picked)
return EXIT_SUCCESS; return EXIT_SUCCESS;
if (ndents) copycurname();
copycurname();
if (!r) { if (!r) {
cfg.filtermode ? presel = FILTER : statusbar(path); cfg.filtermode ? presel = FILTER : statusbar(path);
@ -7598,8 +7590,7 @@ nochange:
presel = FILTER; presel = FILTER;
/* Save current */ /* Save current */
if (ndents) copycurname();
copycurname();
if (!r) if (!r)
goto nochange; goto nochange;
@ -7715,9 +7706,7 @@ nochange:
idle = 0; idle = 0;
} }
if (ndents) copycurname();
copycurname();
goto nochange; goto nochange;
} /* switch (sel) */ } /* switch (sel) */
} }