diff options
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.93 2006/09/30 17:48:22 ray Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.94 2006/11/23 01:35:11 ray Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -298,11 +298,11 @@ static char * | |||
298 | path_append(char *p1, char *p2) | 298 | path_append(char *p1, char *p2) |
299 | { | 299 | { |
300 | char *ret; | 300 | char *ret; |
301 | int len = strlen(p1) + strlen(p2) + 2; | 301 | size_t len = strlen(p1) + strlen(p2) + 2; |
302 | 302 | ||
303 | ret = xmalloc(len); | 303 | ret = xmalloc(len); |
304 | strlcpy(ret, p1, len); | 304 | strlcpy(ret, p1, len); |
305 | if (p1[strlen(p1) - 1] != '/') | 305 | if (p1[0] != '\0' && p1[strlen(p1) - 1] != '/') |
306 | strlcat(ret, "/", len); | 306 | strlcat(ret, "/", len); |
307 | strlcat(ret, p2, len); | 307 | strlcat(ret, p2, len); |
308 | 308 | ||