summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.asciidoc1
-rw-r--r--src/plugins/relay/weechat/relay-weechat-protocol.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 8c6f89666..0065283cb 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -23,6 +23,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* api: fix crash in function string_split_command() when the separator is not
a semicolon (issue #731)
+* relay: allow escape of comma in command "init" (weechat protocol) (issue #730)
[[v1.5]]
== Version 1.5 (2016-05-01)
diff --git a/src/plugins/relay/weechat/relay-weechat-protocol.c b/src/plugins/relay/weechat/relay-weechat-protocol.c
index 34a59745d..834984738 100644
--- a/src/plugins/relay/weechat/relay-weechat-protocol.c
+++ b/src/plugins/relay/weechat/relay-weechat-protocol.c
@@ -170,14 +170,14 @@ relay_weechat_protocol_is_sync (struct t_relay_client *ptr_client,
RELAY_WEECHAT_PROTOCOL_CALLBACK(init)
{
char **options, *pos, *password;
- int num_options, i, compression;
+ int i, compression;
RELAY_WEECHAT_PROTOCOL_MIN_ARGS(1);
- options = weechat_string_split (argv_eol[0], ",", 0, 0, &num_options);
+ options = weechat_string_split_command (argv_eol[0], ',');
if (options)
{
- for (i = 0; i < num_options; i++)
+ for (i = 0; options[i]; i++)
{
pos = strchr (options[i], '=');
if (pos)
@@ -208,7 +208,7 @@ RELAY_WEECHAT_PROTOCOL_CALLBACK(init)
}
}
}
- weechat_string_free_split (options);
+ weechat_string_free_split_command (options);
}
return WEECHAT_RC_OK;