mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-15 21:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary parameter from archive_selection()

Browse source
This commit is contained in:
KlzXS 2022-12-12 16:11:55 +01:00
parent 17ed380b57
commit 87627a6e08
No known key found for this signature in database
GPG key ID: 721F7586CEB48D6A
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nnn.c
View file

@ -763,7 +763,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)$", /* Basic formats that don't need external tools */ "\\.(bz|bz2|gz|tar|taz|tbz|tbz2|tgz|z|zip)$", /* Basic formats that don't need external tools */
SED" -i 's|^%s\\(.*\\)$|%s\\1|' %s", SED" -i 's|^%s\\(.*\\)$|%s\\1|' %s",
SED" -ze 's|^%s/||' '%s' | xargs -0 %s %s", "xargs -0 %s %s < '%s'",
}; };
/* Colors */ /* Colors */
@ -2746,17 +2746,17 @@ static char *get_archive_cmd(const char *archive)
return archive_cmd[i]; return archive_cmd[i];
} }
static void archive_selection(const char *cmd, const char *archive, const char *curpath) static void archive_selection(const char *cmd, const char *archive)
{ {
char *buf = malloc((xstrlen(patterns[P_ARCHIVE_CMD]) + xstrlen(cmd) + xstrlen(archive) char *buf = malloc((xstrlen(patterns[P_ARCHIVE_CMD]) + xstrlen(cmd) + xstrlen(archive)
+ xstrlen(curpath) + xstrlen(selpath)) * sizeof(char)); + xstrlen(selpath)) * sizeof(char));
if (!buf) { if (!buf) {
DPRINTF_S(strerror(errno)); DPRINTF_S(strerror(errno));
printwarn(NULL); printwarn(NULL);
return; return;
} }
snprintf(buf, CMD_LEN_MAX, patterns[P_ARCHIVE_CMD], curpath, selpath, cmd, archive); snprintf(buf, CMD_LEN_MAX, patterns[P_ARCHIVE_CMD], cmd, archive, selpath);
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);
} }
@ -7641,7 +7641,7 @@ nochange:
} }
} }
(r == 's') ? archive_selection(get_archive_cmd(tmp), tmp, "/") (r == 's') ? archive_selection(get_archive_cmd(tmp), tmp)
: spawn(get_archive_cmd(tmp), tmp, pdents[cur].name, : spawn(get_archive_cmd(tmp), tmp, pdents[cur].name,
NULL, F_CLI | F_CONFIRM); NULL, F_CLI | F_CONFIRM);