===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/tildexpand.c,v
retrieving revision 1.8.2.5
retrieving revision 1.9
diff -u -r1.8.2.5 -r1.9
--- src/usr.bin/ssh/Attic/tildexpand.c	2001/09/27 00:15:43	1.8.2.5
+++ src/usr.bin/ssh/Attic/tildexpand.c	2000/12/19 23:17:59	1.9
@@ -11,11 +11,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: tildexpand.c,v 1.8.2.5 2001/09/27 00:15:43 miod Exp $");
+RCSID("$OpenBSD: tildexpand.c,v 1.9 2000/12/19 23:17:59 markus Exp $");
 
 #include "xmalloc.h"
-#include "log.h"
-#include "tildexpand.h"
+#include "ssh.h"
 
 /*
  * Expands tildes in the file name.  Returns data allocated by xmalloc.
@@ -67,6 +66,6 @@
 	if (len > MAXPATHLEN)
 		fatal("Home directory too long (%d > %d", len-1, MAXPATHLEN-1);
 	expanded = xmalloc(len);
-	snprintf(expanded, len, "%s%s%s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", cp + 1);
+	snprintf(expanded, len, "%s/%s", pw->pw_dir, cp + 1);
 	return expanded;
 }