From 84082493cb81b61f9b42cf9528cfe7e29c6594ad Mon Sep 17 00:00:00 2001
From: okan
Date: Thu, 11 Sep 2014 16:06:26 +0000
Subject: Remove incorrect cast in kbfunc_exec. In kbfunc_ssh, reverse logic on
 truncation check so it's obvious.

---
 kbfunc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'kbfunc.c')

diff --git a/kbfunc.c b/kbfunc.c
index 4669dc6..1dedc0a 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: kbfunc.c,v 1.100 2014/09/08 20:11:22 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.101 2014/09/11 16:06:26 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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,8 +372,9 @@ 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))
-			u_spawn(path);
+		if (l == -1 || l >= sizeof(path))
+			goto out;
+		u_spawn(path);
 	}
 out:
 	if (mi != NULL && mi->dummy)
-- 
cgit v1.2.3-2-gb3c3