mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-03-15 11:14:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1101: confirm trashing files

Browse source
This commit is contained in:
Arun Prakash Jana 2021-07-09 21:00:46 +05:30
parent facdc5fdeb
commit 5f5ee10e94
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/nnn.c
View file

@ -514,6 +514,7 @@ static runstate g_state;
#define UTIL_NMV 17 #define UTIL_NMV 17
#define UTIL_TRASH_CLI 18 #define UTIL_TRASH_CLI 18
#define UTIL_GIO_TRASH 19 #define UTIL_GIO_TRASH 19
#define UTIL_RM_RF 20
/* Utilities to open files, run actions */ /* Utilities to open files, run actions */
static char * const utils[] = { static char * const utils[] = {
@ -553,6 +554,7 @@ static char * const utils[] = {
".nmv", ".nmv",
"trash-put", "trash-put",
"gio trash", "gio trash",
"rm -rf",
}; };
/* Common strings */ /* Common strings */
@ -612,7 +614,7 @@ static const char * const messages[] = {
"session name: ", "session name: ",
"'c'p / 'm'v as?", "'c'p / 'm'v as?",
"'c'urrent / 's'el?", "'c'urrent / 's'el?",
"rm -rf %s file%s? [Esc cancels]", "%s %s file%s? [Esc cancels]",
"limit exceeded", "limit exceeded",
"'f'ile / 'd'ir / 's'ym / 'h'ard?", "'f'ile / 'd'ir / 's'ym / 'h'ard?",
"'c'li / 'g'ui?", "'c'li / 'g'ui?",
@ -1372,6 +1374,7 @@ static char confirm_force(bool selection)
char str[64]; char str[64];
snprintf(str, 64, messages[MSG_FORCE_RM], snprintf(str, 64, messages[MSG_FORCE_RM],
g_state.trash ? utils[UTIL_GIO_TRASH] + 4 : utils[UTIL_RM_RF],
(selection ? xitoa(nselected) : "current"), (selection ? "(s)" : "")); (selection ? xitoa(nselected) : "current"), (selection ? "(s)" : ""));
int r = get_input(str); int r = get_input(str);
@ -1379,8 +1382,8 @@ static char confirm_force(bool selection)
if (r == ESC) if (r == ESC)
return '\0'; /* cancel */ return '\0'; /* cancel */
if (r == 'y' || r == 'Y') if (r == 'y' || r == 'Y')
return 'f'; /* forceful */ return 'f'; /* forceful for rm */
return 'i'; /* interactive */ return (g_state.trash ? '\0' : 'i'); /* interactive for rm */
} }
/* Writes buflen char(s) from buf to a file */ /* Writes buflen char(s) from buf to a file */
@ -2179,15 +2182,14 @@ static void opstr(char *buf, char *op)
static bool rmmulstr(char *buf) static bool rmmulstr(char *buf)
{ {
if (!g_state.trash) { char r = confirm_force(TRUE);
char r = confirm_force(TRUE); if (!r)
return FALSE;
if (!r)
return FALSE;
if (!g_state.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 -%cr \"$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",
utils[(g_state.trash == 1) ? UTIL_TRASH_CLI : UTIL_GIO_TRASH], selpath); utils[(g_state.trash == 1) ? UTIL_TRASH_CLI : UTIL_GIO_TRASH], selpath);
@ -2197,13 +2199,14 @@ static bool rmmulstr(char *buf)
/* Returns TRUE if file is removed, else FALSE */ /* Returns TRUE if file is removed, else FALSE */
static bool xrm(char *fpath) static bool xrm(char *fpath)
{ {
char r = confirm_force(FALSE);
if (!r)
return FALSE;
if (!g_state.trash) { if (!g_state.trash) {
char rm_opts[] = "-ir"; char rm_opts[] = "-ir";
rm_opts[1] = confirm_force(FALSE); rm_opts[1] = r;
if (!rm_opts[1])
return FALSE;
spawn("rm", rm_opts, fpath, NULL, F_NORMAL | F_CHKRTN); spawn("rm", rm_opts, fpath, NULL, 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],
@ -4786,7 +4789,7 @@ static void rmlistpath(void)
if (listpath) { if (listpath) {
DPRINTF_S(__func__); DPRINTF_S(__func__);
DPRINTF_S(listpath); DPRINTF_S(listpath);
spawn("rm -rf", listpath, NULL, NULL, F_NOTRACE | F_MULTI); spawn(utils[UTIL_RM_RF], listpath, NULL, NULL, F_NOTRACE | F_MULTI);
/* Do not free if program was started in list mode */ /* Do not free if program was started in list mode */
if (listpath != initpath) if (listpath != initpath)
free(listpath); free(listpath);