X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_ftp.c;h=09aac70782c21c3f1854aef78c0ac50b6bc8ab20;hp=58c2419c049ab7964402183e14c0c3f0529a1cee;hb=9905799a86c606304fd7df2cd401de1740a272a1;hpb=12cb6e09b64a9ecd8ee90f0243fc4af41a64238c diff --git a/lib/silcclient/client_ftp.c b/lib/silcclient/client_ftp.c index 58c2419c..09aac707 100644 --- a/lib/silcclient/client_ftp.c +++ b/lib/silcclient/client_ftp.c @@ -18,7 +18,7 @@ */ /* $Id$ */ -#include "silcincludes.h" +#include "silc.h" #include "silcclient.h" #include "client_internal.h" @@ -317,7 +317,7 @@ static void silc_client_ftp_open_handle(SilcSFTP sftp, /* Open the actual local file */ memset(path, 0, sizeof(path)); - snprintf(path, sizeof(path) - 1, "%s%s", session->path ? + silc_snprintf(path, sizeof(path) - 1, "%s%s", session->path ? session->path : "", session->filepath); session->fd = silc_file_open(path, O_RDWR | O_CREAT | O_EXCL); if (session->fd < 0) { @@ -1155,15 +1155,15 @@ static void silc_client_ftp_resolve_cb(SilcClient client, session->client_entry = client_entry; silc_dlist_add(conn->internal->ftp_sessions, session); - /* Let the application know */ - client->internal->ops->ftp(client, conn, client_entry, - session->session_id, hostname, port); - if (hostname && port) { session->hostname = strdup(hostname); session->port = port; } + /* Let the application know */ + client->internal->ops->ftp(client, conn, client_entry, + session->session_id, hostname, port); + goto out; }