Mercurial > pidgin
changeset 25065:d96190de653a
Add + in place of spaces in p2p url, fixes transfer of file with name containing spaces
| author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
|---|---|
| date | Wed, 09 Jul 2008 18:19:37 +0000 |
| parents | 2fb8c39d0494 |
| children | 37b207e08c69 |
| files | libpurple/protocols/yahoo/yahoo_filexfer.c |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Wed Jul 09 15:05:09 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Wed Jul 09 18:19:37 2008 +0000 @@ -1330,7 +1330,7 @@ url_head = g_strdup_printf("HEAD %s", xd->xfer_url); url_get = g_strdup_printf("GET %s", xd->xfer_url); - + if( strncmp(url_head, (char *)buf, strlen(url_head)) == 0 ) xd->status_15 = P2P_HEAD_REQUESTED; else if( strncmp(url_get, (char *)buf, strlen(url_get)) == 0 ) @@ -1405,6 +1405,8 @@ gchar *filename; const char *local_ip; gchar *url_to_send = NULL; + char **split; + char *filename_without_spaces = NULL; xfer = data; if ( !( (xd = xfer->data) || (listenfd != -1) ) ) { @@ -1422,7 +1424,10 @@ local_ip = purple_network_get_my_ip(listenfd); xd->yahoo_local_p2p_ft_server_port = purple_network_get_port_from_fd(listenfd); - xd->xfer_url = g_strdup_printf("/Messenger.%s.%d000%s?AppID=Messenger&UserID=%s&K=lc9lu2u89gz1llmplwksajkjx", xfer->who, (int)time(NULL), filename, xfer->who); + + split = g_strsplit(filename, " ", 0); + filename_without_spaces = g_strjoinv("+", split); + xd->xfer_url = g_strdup_printf("/Messenger.%s.%d000%s?AppID=Messenger&UserID=%s&K=lc9lu2u89gz1llmplwksajkjx", xfer->who, (int)time(NULL), filename_without_spaces, xfer->who); url_to_send = g_strdup_printf("http://%s:%d%s", local_ip, xd->yahoo_local_p2p_ft_server_port, xd->xfer_url); xd->info_val_249 = 1; /* 249=1: we are p2p server */ @@ -1437,6 +1442,8 @@ g_free(filename); g_free(url_to_send); + g_strfreev(split); + g_free(filename_without_spaces); } /* Add an Input Read event to the file descriptor */