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

rm improvements:

Browse source 
- log removed filename
- cancel on 'n' or 'N'
This commit is contained in:
Arun Prakash Jana 2024-08-14 05:05:32 +05:30
parent 9b33c49f68
commit 0fb4ed5093
No known key found for this signature in database
GPG key ID: 4A865183AF6C5631
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nnn.c
View file

@ -1566,6 +1566,8 @@ static char confirm_force(bool selection, bool use_trash)
return '\0'; /* cancel */ return '\0'; /* cancel */
if (r == 'y' || r == 'Y') if (r == 'y' || r == 'Y')
return 'f'; /* forceful for rm */ return 'f'; /* forceful for rm */
if (r == 'n' || r == 'N')
return '\0'; /* cancel */
return (use_trash ? '\0' : 'i'); /* interactive for rm */ return (use_trash ? '\0' : 'i'); /* interactive for rm */
} }
@ -2558,7 +2560,7 @@ static bool rmmulstr(char *buf, bool use_trash)
return FALSE; return FALSE;
if (!use_trash) if (!use_trash)
snprintf(buf, CMD_LEN_MAX, "xargs -0 sh -c 'rm -%cr -- \"$0\" \"$@\" < /dev/tty' < %s", snprintf(buf, CMD_LEN_MAX, "xargs -0 sh -c 'rm -%cvr -- \"$0\" \"$@\" < /dev/tty' < %s",
r, selpath); r, selpath);
else else
snprintf(buf, CMD_LEN_MAX, "xargs -0 %s < %s", snprintf(buf, CMD_LEN_MAX, "xargs -0 %s < %s",
@ -2575,9 +2577,9 @@ static bool xrm(char * const fpath, bool use_trash)
return FALSE; return FALSE;
if (!use_trash) { if (!use_trash) {
char rm_opts[] = "-ir"; char rm_opts[5] = "-vr\0";
rm_opts[1] = r; rm_opts[3] = r;
spawn("rm", rm_opts, "--", fpath, F_NORMAL | F_CHKRTN); spawn("rm", rm_opts, "--", fpath, F_NORMAL | F_CHKRTN);
} else } else
spawn(utils[(g_state.trash == 1) ? UTIL_TRASH_CLI : UTIL_GIO_TRASH], spawn(utils[(g_state.trash == 1) ? UTIL_TRASH_CLI : UTIL_GIO_TRASH],