- markus@cvs.openbsd.org 2001/11/07 22:53:21

[openssh.git] / tildexpand.c

diff --git a/tildexpand.c b/tildexpand.c
index d10ea0054ff17d7f5bf66361d1fb6c8404abe3f7..e89a7ade8acdf762b3f08a89208a6521a8143034 100644 (file)
--- a/tildexpand.c
+++ b/tildexpand.c
@@ -2,14 +2,20 @@
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * Created: Wed Jul 12 01:07:36 1995 ylo
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: tildexpand.c,v 1.7 2000/06/20 01:39:45 markus Exp $");
+RCSID("$OpenBSD: tildexpand.c,v 1.12 2001/08/11 22:51:27 jakob Exp $");
 
 #include "xmalloc.h"
-#include "ssh.h"
+#include "log.h"
+#include "tildexpand.h"
 
 /*
  * Expands tildes in the file name.  Returns data allocated by xmalloc.
@@ -19,7 +25,7 @@ char *
 tilde_expand_filename(const char *filename, uid_t my_uid)
 {
        const char *cp;
-       unsigned int userlen;
+       u_int userlen;
        char *expanded;
        struct passwd *pw;
        char user[100];
@@ -61,6 +67,6 @@ tilde_expand_filename(const char *filename, uid_t my_uid)
        if (len > MAXPATHLEN)
                fatal("Home directory too long (%d > %d", len-1, MAXPATHLEN-1);
        expanded = xmalloc(len);
-       snprintf(expanded, len, "%s/%s", pw->pw_dir, cp + 1);
+       snprintf(expanded, len, "%s%s%s", pw->pw_dir, strcmp(pw->pw_dir, "/") ? "/" : "", cp + 1);
        return expanded;
 }