diff options
author | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-13 19:37:19 +0200 |
---|---|---|
committer | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-13 19:37:19 +0200 |
commit | af83fb55e10b3648656f540a5cb3ec826ea7440c (patch) | |
tree | 3e1c92af0ebcbc2fa63051a7c59bfa364c37a05d | |
parent | e94e4a92f4a6867915a4c423881bd379f0c1191e (diff) | |
download | weechat-af83fb55e10b3648656f540a5cb3ec826ea7440c.zip |
relay: allow escape of comma in command "init" (weechat protocol) (issue #730)
-rw-r--r-- | ChangeLog.asciidoc | 1 | ||||
-rw-r--r-- | src/plugins/relay/weechat/relay-weechat-protocol.c | 8 |
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; |