Remove incorrect cast in kbfunc_exec. In kbfunc_ssh, reverse logic on

truncation check so it's obvious.
This commit is contained in:
okan 2014-09-11 16:06:26 +00:00
parent d27fc99784
commit 26b95de019

View File

@ -281,8 +281,7 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg)
(void)memset(tpath, '\0', sizeof(tpath));
l = snprintf(tpath, sizeof(tpath), "%s/%s", paths[i],
dp->d_name);
/* check for truncation etc */
if (l == -1 || l >= (int)sizeof(tpath))
if (l == -1 || l >= sizeof(tpath))
continue;
if (access(tpath, X_OK) == 0)
menuq_add(&menuq, NULL, "%s", dp->d_name);
@ -373,7 +372,8 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg)
goto out;
l = snprintf(path, sizeof(path), "%s -T '[ssh] %s' -e ssh %s",
cmd->path, mi->text, mi->text);
if (l != -1 && l < sizeof(path))
if (l == -1 || l >= sizeof(path))
goto out;
u_spawn(path);
}
out: