aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

Merge pull request #658 from LemonBoy/dcc-autoaccept

Browse Source 
Quote the filename when dcc requests are auto accepted.
This commit is contained in:
ailin-nemui 2017-03-04 21:43:21 +01:00 committed by GitHub
commit 29f27cfb39
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/misc.c
View File

@ -724,18 +724,20 @@ int expand_escape(const char **data)
}
}
/* Escape all '"', "'" and '\' chars with '\' */
char *escape_string(const char *str)
/* Escape all the characters in `what' with a backslash */
char *escape_string(const char *str, const char *what)
{
char *ret, *p;
const char *p;
char *ret;
p = ret = g_malloc(strlen(str)*2+1);
while (*str != '\0') {
if (*str == '"' || *str == '\'' || *str == '\\')
*p++ = '\\';
*p++ = *str++;
ret = g_malloc(strlen(str) * 2 + 1);
for (p = str; *p != '\0'; p++, ret++) {
if (strchr(what, *p) != NULL) {
*ret++ = '\\';
}
*ret = *p;
}
*p = '\0';
*ret = '\0';
return ret;
}

4
src/core/misc.h
View File

@ -88,8 +88,8 @@ char *stristr_full(const char *data, const char *key);
char *ascii_strup(char *str);
char *ascii_strdown(char *str);
/* Escape all '"', "'" and '\' chars with '\' */
char *escape_string(const char *str);
/* Escape all the characters in `what' with a backslash */
char *escape_string(const char *str, const char *what);
/* convert all low-ascii (<32) to ^<A..> combinations */
char *show_lowascii(const char *str);

2
src/fe-common/core/chat-completion.c
View File

@ -1113,7 +1113,7 @@ static void event_text(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
/* the nick is quoted in case it contains '-' character. also
spaces should work too now :) The nick is also escaped in case
it contains '\' characters */
target = escape_string(window_item_get_target(item));
target = escape_string(window_item_get_target(item), "\"'\\");
str = g_strdup_printf(IS_CHANNEL(item) ? "-channel \"%s\" %s" :
IS_QUERY(item) ? "-nick \"%s\" %s" : "%s %s",
target, line);

10
src/irc/dcc/dcc-autoget.c
View File

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