aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

'\' characters in nicks were skipped when sending messages in queries.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2867 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-07-16 16:20:10 +00:00 committed by cras
parent c9f5eafb3d
commit d11cb0f2c2
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/misc.c
View File

@ -770,3 +770,19 @@ int expand_escape(const char **data)
return strtol(digit, NULL, 8);
}
}
/* Escape all '"', "'" and '\' chars with '\' */
char *escape_string(const char *str)
{
char *ret, *p;
p = ret = g_malloc(strlen(str)*2+1);
while (*str != '\0') {
if (*str == '"' || *str == '\'' || *str == '\\')
*p++ = '\\';
*p++ = *str++;
}
*p = '\0';
return ret;
}

3
src/core/misc.h
View File

@ -105,4 +105,7 @@ GSList *columns_sort_list(GSList *list, int rows);
one after '\'. Returns the expanded character or -1 if error. */
int expand_escape(const char **data);
/* Escape all '"', "'" and '\' chars with '\' */
char *escape_string(const char *str);
#endif

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

@ -928,7 +928,7 @@ static char *auto_complete(CHANNEL_REC *channel, const char *line)
static void event_text(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
{
char *line, *str;
char *line, *str, *target;
g_return_if_fail(data != NULL);
@ -956,9 +956,11 @@ 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 :) Unquoter function also allows
'"' characters as long as the next character isn't space. */
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",
window_item_get_target(item), line);
target, line);
g_free(target);
signal_emit("command msg", 3, str, server, item);