mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #400: several selection issues in v2.8.1

This commit is contained in:
Arun Prakash Jana 2019-12-10 20:48:27 +05:30
parent 8d143bb87f
commit 92bba0cbf8
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/nnn.c
View File

@ -1053,22 +1053,23 @@ static void clearselection(void)
writesel(NULL, 0); writesel(NULL, 0);
} }
static bool editselection(void) /* Returns: 1 - success, 0 - none selected, -1 - other failure */
static int editselection(void)
{ {
bool ret = FALSE; int ret = -1;
int fd, lines = 0; int fd, lines = 0;
ssize_t count; ssize_t count;
struct stat sb; struct stat sb;
if (!selbufpos) { if (!selbufpos) {
DPRINTF_S("empty selection"); DPRINTF_S("empty selection");
return FALSE; return 0;
} }
fd = create_tmp_file(); fd = create_tmp_file();
if (fd == -1) { if (fd == -1) {
DPRINTF_S("couldn't create tmp file"); DPRINTF_S("couldn't create tmp file");
return FALSE; return -1;
} }
seltofile(fd, NULL); seltofile(fd, NULL);
@ -1080,7 +1081,7 @@ static bool editselection(void)
if (fd == -1) { if (fd == -1) {
DPRINTF_S("couldn't read tmp file"); DPRINTF_S("couldn't read tmp file");
unlink(g_tmpfpath); unlink(g_tmpfpath);
return FALSE; return -1;
} }
fstat(fd, &sb); fstat(fd, &sb);
@ -1095,7 +1096,7 @@ static bool editselection(void)
unlink(g_tmpfpath); unlink(g_tmpfpath);
if (!count) { if (!count) {
ret = TRUE; ret = 1;
goto emptyedit; goto emptyedit;
} }
@ -1128,7 +1129,7 @@ static bool editselection(void)
writesel(pselbuf, selbufpos - 1); writesel(pselbuf, selbufpos - 1);
spawn(copier, NULL, NULL, NULL, F_NOTRACE); spawn(copier, NULL, NULL, NULL, F_NOTRACE);
return TRUE; return 1;
emptyedit: emptyedit:
resetselind(); resetselind();
@ -4864,6 +4865,11 @@ nochange:
dents[cur].flags ^= FILE_SELECTED; dents[cur].flags ^= FILE_SELECTED;
dents[cur].flags ? ++nselected : --nselected; dents[cur].flags ? ++nselected : --nselected;
if (!nselected) {
writesel(NULL, 0);
unlink(g_selpath);
}
/* move cursor to the next entry if this is not the last entry */ /* move cursor to the next entry if this is not the last entry */
if (!cfg.picker && cur != ndents - 1) if (!cfg.picker && cur != ndents - 1)
move_cursor((cur + 1) % ndents, 0); move_cursor((cur + 1) % ndents, 0);
@ -4952,8 +4958,11 @@ nochange:
if (nselected) if (nselected)
updateselbuf(path, newpath); updateselbuf(path, newpath);
if (!editselection()) { r = editselection();
printwait(messages[MSG_FAILED], &presel); if (r <= 0) {
const char * msg
= (!r ? messages[MSG_0_SELECTED] : messages[MSG_FAILED]);
printwait(msg, &presel);
goto nochange; goto nochange;
} }
break; break;