mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 13:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support rm current entry

Browse source
This commit is contained in:
Arun Prakash Jana 2018-11-11 06:15:18 +05:30
parent f41ed544d5
commit dd1eb788d5
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/nnn.c
View file

@ -3078,26 +3078,19 @@ nochange:
case SEL_MV: case SEL_MV:
case SEL_RMMUL: case SEL_RMMUL:
{ {
char *cmd;
if (!g_cppath[0]) { if (!g_cppath[0]) {
printmsg("copy file not found"); printmsg("copy file not found");
goto nochange; goto nochange;
} }
if (sel == SEL_CP) if (sel == SEL_CP)
r = asprintf(&cmd, "xargs -0 -d \'\n\' -a %s cp -ir --preserve=all -t .", g_cppath); snprintf(g_buf, MAX_CMD_LEN, "xargs -0 -d \'\n\' -a %s cp -ir --preserve=all -t .", g_cppath);
else if (sel == SEL_MV) else if (sel == SEL_MV)
r = asprintf(&cmd, "xargs -0 -d \'\n\' -a %s mv -i -t .", g_cppath); snprintf(g_buf, MAX_CMD_LEN, "xargs -0 -d \'\n\' -a %s mv -i -t .", g_cppath);
else /* SEL_RMMUL */ else /* SEL_RMMUL */
r = asprintf(&cmd, "xargs -0 -d \'\n\' -a %s rm -Ir", g_cppath); snprintf(g_buf, MAX_CMD_LEN, "xargs -0 -d \'\n\' -a %s rm -Ir", g_cppath);
if (r == -1) { spawn("sh", "-c", g_buf, path, F_NORMAL | F_SIGINT);
printwarn();
goto nochange;
}
spawn("sh", "-c", cmd, path, F_NORMAL | F_SIGINT);
free(cmd);
copycurname(); copycurname();
if (cfg.filtermode) if (cfg.filtermode)
@ -3105,6 +3098,12 @@ nochange:
goto begin; goto begin;
} }
case SEL_RM: case SEL_RM:
if (!ndents)
break;
mkpath(path, dents[cur].name, newpath, PATH_MAX);
spawn("rm", "-Ir", newpath, NULL, F_NORMAL | F_SIGINT);
lastname[0] = '\0'; lastname[0] = '\0';
if (cfg.filtermode) if (cfg.filtermode)
presel = FILTER; presel = FILTER;