From 5dd5710b310a79652e092631d29313b83f33e8bb Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sat, 9 Mar 2019 09:05:32 +0530 Subject: Support trash-cli to trash --- src/nnn.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/nnn.c b/src/nnn.c index c66a69e..fdf4339 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -1141,20 +1141,32 @@ static void mvstr(char *buf) static void rmmulstr(char *buf) { - snprintf(buf, CMD_LEN_MAX, + if (cfg.trash) { + snprintf(buf, CMD_LEN_MAX, +#ifdef __linux__ + "xargs -0 -a %s trash-put", g_cppath); +#else + "cat %s | xargs -0 trash-put", g_cppath); +#endif + } else { + snprintf(buf, CMD_LEN_MAX, #ifdef __linux__ - "xargs -0 -a %s rm -%cr", + "xargs -0 -a %s rm -%cr", g_cppath, confirm_force()); #else - "cat %s | xargs -0 -o rm -%cr", + "cat %s | xargs -0 -o rm -%cr", g_cppath, confirm_force()); #endif - g_cppath, confirm_force()); + } } static void xrm(char *path) { - char rm_opts[] = {'-', confirm_force(), 'r'}; + if (cfg.trash) + spawn("trash-put", path, NULL, NULL, F_NORMAL | F_SIGINT); + else { + char rm_opts[] = {'-', confirm_force(), 'r'}; - spawn("rm", rm_opts, path, NULL, F_NORMAL | F_SIGINT); + spawn("rm", rm_opts, path, NULL, F_NORMAL | F_SIGINT); + } } static void archive_selection(const char *archive, const char *curpath) -- cgit v1.2.3-70-g09d2