From 43c636d95c6ac835c1a92bcabe4297268fd41aa9 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Tue, 15 Oct 2019 06:15:32 +0530 Subject: [PATCH] Simplify functions --- src/nnn.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/nnn.c b/src/nnn.c index 1c82b923..fbfc44d5 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -1239,23 +1239,12 @@ static bool xdiraccess(const char *path) return TRUE; } -static void cpstr(char *buf) +static void opstr(char *buf, char *op) { - snprintf(buf, CMD_LEN_MAX, #ifdef __linux__ - "xargs -0 -a %s -%c {} %s {} .", g_selpath, REPLACE_STR, cp); + snprintf(buf, CMD_LEN_MAX, "xargs -0 -a %s -%c {} %s {} .", g_selpath, REPLACE_STR, op); #else - "cat %s | xargs -0 -o -%c {} %s {} .", g_selpath, REPLACE_STR, cp); -#endif -} - -static void mvstr(char *buf) -{ - snprintf(buf, CMD_LEN_MAX, -#ifdef __linux__ - "xargs -0 -a %s -%c {} %s {} .", g_selpath, REPLACE_STR, mv); -#else - "cat %s | xargs -0 -o -%c {} %s {} .", g_selpath, REPLACE_STR, mv); + snprintf(buf, CMD_LEN_MAX, "cat %s | xargs -0 -o -%c {} %s {} .", g_selpath, REPLACE_STR, op); #endif } @@ -4404,10 +4393,10 @@ nochange: switch (sel) { case SEL_CP: - cpstr(g_buf); + opstr(g_buf, cp); break; case SEL_MV: - mvstr(g_buf); + opstr(g_buf, mv); break; case SEL_CPAS: if (!cpmv_rename(path, cp)) {