1
0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00

Merge pull request #667 from ailin-nemui/fix-dcc-get

fix dcc get

fixes #656
This commit is contained in:
ailin-nemui 2017-03-08 09:45:40 +01:00 committed by GitHub
commit d57c64adeb

View File

@ -23,6 +23,7 @@
#include "masks.h" #include "masks.h"
#include "settings.h" #include "settings.h"
#include "servers.h" #include "servers.h"
#include "misc.h"
#include "dcc-get.h" #include "dcc-get.h"
@ -30,7 +31,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
{ {
struct stat statbuf; struct stat statbuf;
const char *masks; const char *masks;
char *str, *file; char *str, *file, *esc_arg;
int max_size; int max_size;
if (!IS_DCC_GET(dcc)) return; if (!IS_DCC_GET(dcc)) return;
@ -68,11 +69,13 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr)
/* ok. but do we want/need to resume? */ /* ok. but do we want/need to resume? */
file = dcc_get_download_path(dcc->arg); file = dcc_get_download_path(dcc->arg);
esc_arg = escape_string(dcc->arg);
str = g_strdup_printf(settings_get_bool("dcc_autoresume") && str = g_strdup_printf(settings_get_bool("dcc_autoresume") &&
stat(file, &statbuf) == 0 ? stat(file, &statbuf) == 0 ?
"RESUME %s %s" : "GET %s %s", "RESUME %s \"%s\"" : "GET %s \"%s\"",
dcc->nick, dcc->arg); dcc->nick, esc_arg);
signal_emit("command dcc", 2, str, dcc->server); signal_emit("command dcc", 2, str, dcc->server);
g_free(esc_arg);
g_free(file); g_free(file);
g_free(str); g_free(str);
} }