Return to sftp.c CVS log | Up to [local] / src / usr.bin / ssh |
version 1.93, 2006/09/30 17:48:22 | version 1.94, 2006/11/23 01:35:11 | ||
---|---|---|---|
|
|
||
path_append(char *p1, char *p2) | path_append(char *p1, char *p2) | ||
{ | { | ||
char *ret; | char *ret; | ||
int len = strlen(p1) + strlen(p2) + 2; | size_t len = strlen(p1) + strlen(p2) + 2; | ||
ret = xmalloc(len); | ret = xmalloc(len); | ||
strlcpy(ret, p1, len); | strlcpy(ret, p1, len); | ||
if (p1[strlen(p1) - 1] != '/') | if (p1[0] != '\0' && p1[strlen(p1) - 1] != '/') | ||
strlcat(ret, "/", len); | strlcat(ret, "/", len); | ||
strlcat(ret, p2, len); | strlcat(ret, p2, len); | ||