mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-23 09:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace %s and %S with %j and %J

Browse source 
Those two conversions aren't used by any printf and scanf functions so there will no longer be any erroneous rewrites

Style fixes
This commit is contained in:
KlzXS 2021-10-22 19:58:50 +02:00
parent bc69c968be
commit 73ef170da7
No known key found for this signature in database
GPG key ID: 6F2A29F874A14243
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/nnn.c
View file

@ -5350,11 +5350,11 @@ static bool prompt_run(void)
{ {
bool ret = FALSE; bool ret = FALSE;
char *cmdline, *next; char *cmdline, *next;
int cnt_s, cnt_S; int cnt_j, cnt_J;
size_t len, tmplen; size_t len, tmplen;
const char *xargs_s = "xargs -0 -t -I{} sh -c '%s' < %s"; const char *xargs_j = "xargs -0 -t -I{} sh -c '%s' < %s";
const char *xargs_S = "xargs -0 -t sh -c '%s' < %s"; const char *xargs_J = "xargs -0 -t sh -c '%s' < %s";
char tmpcmd[CMD_LEN_MAX]; char tmpcmd[CMD_LEN_MAX];
char cmd[CMD_LEN_MAX + 32]; // 32 for xargs format strings char cmd[CMD_LEN_MAX + 32]; // 32 for xargs format strings
@ -5377,22 +5377,24 @@ static bool prompt_run(void)
len = xstrlen(cmdline); len = xstrlen(cmdline);
cnt_s = 0; cnt_j = 0;
next = cmdline; next = cmdline;
while ((next = strstr(next, "%s"))) { while ((next = strstr(next, " %j"))) {
++cnt_s; ++cnt_j;
++next; // skip the space we don't need it
// replace %s with {} for xargs later // replace %j with {} for xargs later
next[0] = '{'; next[0] = '{';
next[1] = '}'; next[1] = '}';
++next; ++next;
} }
cnt_S = 0; cnt_J = 0;
next = cmdline; next = cmdline;
while (!cnt_s && (next = strstr(next, "%S"))) { while (!cnt_j && (next = strstr(next, " %J"))) {
++cnt_S; ++cnt_J;
++next; // skip the space we don't need it
tmplen = xstrsncpy(tmpcmd, cmdline, next - cmdline + 1) - 1; tmplen = xstrsncpy(tmpcmd, cmdline, next - cmdline + 1) - 1;
tmplen += xstrsncpy(tmpcmd + tmplen, "${0} ${@}", sizeof("${0} ${@}")); tmplen += xstrsncpy(tmpcmd + tmplen, "${0} ${@}", sizeof("${0} ${@}"));
@ -5401,18 +5403,16 @@ static bool prompt_run(void)
++next; ++next;
} }
// We can't handle both %s and %S in a single command // We can't handle both %j and %J in a single command
if (cnt_s && cnt_S) if (cnt_j && cnt_J)
// Maybe print a warning break;
continue;
if (cnt_s) { if (cnt_j)
snprintf(cmd, CMD_LEN_MAX + 32, xargs_s, cmdline, selpath); snprintf(cmd, CMD_LEN_MAX + 32, xargs_j, cmdline, selpath);
} else if (cnt_S) { else if (cnt_J)
snprintf(cmd, CMD_LEN_MAX + 32, xargs_S, tmpcmd, selpath); snprintf(cmd, CMD_LEN_MAX + 32, xargs_J, tmpcmd, selpath);
}
spawn(shell, "-c", (cnt_s || cnt_S) ? cmd : cmdline, NULL, F_CLI | F_CONFIRM); spawn(shell, "-c", (cnt_j || cnt_J) ? cmd : cmdline, NULL, F_CLI | F_CONFIRM);
} }
return ret; return ret;