From b51dad6408462dbf75405e8484997ec455c33e9c Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@vmlinux.org>
Date: Fri, 23 Jul 2010 09:46:49 +0200
Subject: [PATCH] Minor fixes from changeset a5f54865d41c3f181a06 from Heimdal
 project http://github.com/heimdal/heimdal

---
 src/complete.c | 7 +++----
 src/editline.c | 7 ++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/complete.c b/src/complete.c
index 420b0f0..c1eb394 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -186,10 +186,9 @@ char *default_rl_complete(char *pathname, int *unique)
         j = strlen(av[0]) - len + 2;
         if ((p = NEW(char, j + 1)) != NULL) {
             COPYFROMTO(p, av[0] + len, j);
-            if ((new = NEW(char, strlen(dir) + strlen(av[0]) + 2)) != NULL) {
-                (void)strcpy(new, dir);
-                (void)strcat(new, "/");
-                (void)strcat(new, av[0]);
+	    len = strlen(dir) + strlen(av[0]) + 2;
+            if ((new = NEW(char, len)) != NULL) {
+		snprintf(new, len, "%s/%s", dir, av[0]);
                 rl_add_slash(new, p);
                 DISPOSE(new);
             }
diff --git a/src/editline.c b/src/editline.c
index 7258405..3bf612a 100644
--- a/src/editline.c
+++ b/src/editline.c
@@ -182,7 +182,7 @@ static void tty_string(char *p)
 
 static int tty_get(void)
 {
-    char        c;
+    char c;
     int r;
 
     tty_flush();
@@ -194,9 +194,10 @@ static int tty_get(void)
         return *Input++;
     do
     {
-        r= read(0, &c, (SIZE_T)1);
+        r = read(0, &c, 1);
     } while (r == -1 && errno == EINTR);
-    return r  == 1 ? c : EOF;
+
+    return r == 1 ? c : EOF;
 }
 
 #define tty_back()       (backspace ? tty_puts(backspace) : tty_put('\b'))