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

Do not save trash setting in config (and session)

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-21 21:54:26 +05:30
parent a1b8631d96
commit ca257e6016
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/nnn.c
View file

@ -250,7 +250,7 @@ typedef struct {
uint selmode : 1; /* Set when selecting files */ uint selmode : 1; /* Set when selecting files */
uint showdetail : 1; /* Clear to show fewer file info */ uint showdetail : 1; /* Clear to show fewer file info */
uint ctxactive : 1; /* Context active or not */ uint ctxactive : 1; /* Context active or not */
uint reserved : 2; uint reserved1 : 2;
/* The following settings are global */ /* The following settings are global */
uint forcequit : 1; /* Do not confirm when quitting program */ uint forcequit : 1; /* Do not confirm when quitting program */
uint curctx : 2; /* Current context number */ uint curctx : 2; /* Current context number */
@ -265,7 +265,7 @@ typedef struct {
uint runctx : 2; /* The context in which plugin is to be run */ uint runctx : 2; /* The context in which plugin is to be run */
uint regex : 1; /* Use regex filters */ uint regex : 1; /* Use regex filters */
uint x11 : 1; /* Copy to system clipboard and show notis */ uint x11 : 1; /* Copy to system clipboard and show notis */
uint trash : 1; /* Move removed files to trash */ uint reserved2 : 1;
uint mtime : 1; /* Use modification time (else access time) */ uint mtime : 1; /* Use modification time (else access time) */
uint cliopener : 1; /* All-CLI app opener */ uint cliopener : 1; /* All-CLI app opener */
uint waitedit : 1; /* For ops that can't be detached, used EDITOR */ uint waitedit : 1; /* For ops that can't be detached, used EDITOR */
@ -304,7 +304,7 @@ static settings cfg = {
0, /* selmode */ 0, /* selmode */
0, /* showdetail */ 0, /* showdetail */
1, /* ctxactive */ 1, /* ctxactive */
0, /* reserved */ 0, /* reserved1 */
0, /* forcequit */ 0, /* forcequit */
0, /* curctx */ 0, /* curctx */
0, /* dircolor */ 0, /* dircolor */
@ -318,7 +318,7 @@ static settings cfg = {
0, /* runctx */ 0, /* runctx */
0, /* regex */ 0, /* regex */
0, /* x11 */ 0, /* x11 */
0, /* trash */ 0, /* reserved2 */
1, /* mtime */ 1, /* mtime */
0, /* cliopener */ 0, /* cliopener */
0, /* waitedit */ 0, /* waitedit */
@ -391,6 +391,7 @@ static char g_pipepath[TMP_LEN_MAX] __attribute__ ((aligned));
#define STATE_MOVE_OP 0x8 #define STATE_MOVE_OP 0x8
#define STATE_AUTONEXT 0x10 #define STATE_AUTONEXT 0x10
#define STATE_MSG 0x20 #define STATE_MSG 0x20
#define STATE_TRASH 0x40
static uchar g_states; static uchar g_states;
@ -1652,7 +1653,7 @@ static void opstr(char *buf, char *op)
static void rmmulstr(char *buf) static void rmmulstr(char *buf)
{ {
if (cfg.trash) if (g_states & STATE_TRASH)
snprintf(buf, CMD_LEN_MAX, "xargs -0 trash-put < %s", g_selpath); snprintf(buf, CMD_LEN_MAX, "xargs -0 trash-put < %s", g_selpath);
else else
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",
@ -1661,7 +1662,7 @@ static void rmmulstr(char *buf)
static void xrm(char *path) static void xrm(char *path)
{ {
if (cfg.trash) if (g_states & STATE_TRASH)
spawn("trash-put", path, NULL, NULL, F_NORMAL); spawn("trash-put", path, NULL, NULL, F_NORMAL);
else { else {
char rm_opts[] = "-ir"; char rm_opts[] = "-ir";
@ -6721,7 +6722,7 @@ int main(int argc, char *argv[])
/* Configure trash preference */ /* Configure trash preference */
if (xgetenv_set(env_cfg[NNN_TRASH])) if (xgetenv_set(env_cfg[NNN_TRASH]))
cfg.trash = 1; g_states |= STATE_TRASH;
/* Ignore/handle certain signals */ /* Ignore/handle certain signals */
struct sigaction act = {.sa_handler = sigint_handler}; struct sigaction act = {.sa_handler = sigint_handler};