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

use patterns[] for archive command string

Browse source
This commit is contained in:
NRK 2021-11-24 22:34:22 +06:00
parent 578e6d1aaa
commit bd8faa2dd8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nnn.c
View file

@ -765,6 +765,7 @@ static const char * const toks[] = {
#define P_CPMVRNM 1 #define P_CPMVRNM 1
#define P_ARCHIVE 2 #define P_ARCHIVE 2
#define P_REPLACE 3 #define P_REPLACE 3
#define P_ARCHIVE_CMD 4
static const char * const patterns[] = { static const char * const patterns[] = {
SED" -i 's|^\\(\\(.*/\\)\\(.*\\)$\\)|#\\1\\n\\3|' %s", SED" -i 's|^\\(\\(.*/\\)\\(.*\\)$\\)|#\\1\\n\\3|' %s",
@ -772,6 +773,7 @@ static const char * const patterns[] = {
"%s | tr '\\n' '\\0' | xargs -0 -n2 sh -c '%s \"$0\" \"$@\" < /dev/tty'", "%s | tr '\\n' '\\0' | xargs -0 -n2 sh -c '%s \"$0\" \"$@\" < /dev/tty'",
"\\.(bz|bz2|gz|tar|taz|tbz|tbz2|tgz|z|zip)$", "\\.(bz|bz2|gz|tar|taz|tbz|tbz2|tgz|z|zip)$",
SED" -i 's|^%s\\(.*\\)$|%s\\1|' %s", SED" -i 's|^%s\\(.*\\)$|%s\\1|' %s",
SED" -ze 's|^%s/||' '%s' | xargs -0 %s %s",
}; };
/* Colors */ /* Colors */
@ -2719,10 +2721,9 @@ static void get_archive_cmd(char *cmd, const char *archive)
xstrsncpy(cmd, archive_cmd[i], ARCHIVE_CMD_LEN); xstrsncpy(cmd, archive_cmd[i], ARCHIVE_CMD_LEN);
} }
#define CMD_FMT " -ze 's|^%s/||' '%s' | xargs -0 %s %s"
static void archive_selection(const char *cmd, const char *archive, const char *curpath) static void archive_selection(const char *cmd, const char *archive, const char *curpath)
{ {
char *buf = malloc((sizeof(CMD_FMT) + xstrlen(cmd) + xstrlen(archive) char *buf = malloc((xstrlen(patterns[P_ARCHIVE_CMD]) + xstrlen(cmd) + xstrlen(archive)
+ xstrlen(curpath) + xstrlen(selpath)) * sizeof(char)); + xstrlen(curpath) + xstrlen(selpath)) * sizeof(char));
if (!buf) { if (!buf) {
DPRINTF_S(strerror(errno)); DPRINTF_S(strerror(errno));
@ -2730,11 +2731,10 @@ static void archive_selection(const char *cmd, const char *archive, const char *
return; return;
} }
snprintf(buf, CMD_LEN_MAX, SED CMD_FMT, curpath, selpath, cmd, archive); snprintf(buf, CMD_LEN_MAX, patterns[P_ARCHIVE_CMD], curpath, selpath, cmd, archive);
spawn(utils[UTIL_SH_EXEC], buf, NULL, NULL, F_CLI | F_CONFIRM); spawn(utils[UTIL_SH_EXEC], buf, NULL, NULL, F_CLI | F_CONFIRM);
free(buf); free(buf);
} }
#undef CMD_FMT
static void write_lastdir(const char *curpath, const char *outfile) static void write_lastdir(const char *curpath, const char *outfile)
{ {