mirror of
https://github.com/weechat/weechat.git
synced 2026-06-14 07:04:46 +02:00
Compare commits
44 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9df8044cae | |||
| 679a87c571 | |||
| da301b41d3 | |||
| c12c488933 | |||
| 345d99a9b5 | |||
| c6ad4bfd20 | |||
| 43697033cf | |||
| eb7fd8ac9e | |||
| 2325d43447 | |||
| 7cb991667c | |||
| 22370481a0 | |||
| 3d40f96e2d | |||
| f29dd1585e | |||
| 3d041a0364 | |||
| f418b4204e | |||
| 680426100d | |||
| b1a4cd3fab | |||
| 486ea8837a | |||
| e5725a366d | |||
| 1de31fc6a2 | |||
| 4dd47188f5 | |||
| 35df848e73 | |||
| 1cec7e8126 | |||
| a70ca92b74 | |||
| 684f10c442 | |||
| 2d081b0ef3 | |||
| 19be144d2f | |||
| fb9a69c6ae | |||
| c82486d437 | |||
| 802e462ce5 | |||
| 126a42235c | |||
| ddb1db9a2c | |||
| 26c000c6b0 | |||
| 59e292a5be | |||
| 8617bd7d2a | |||
| e262cd47b4 | |||
| 5a7db09eb2 | |||
| 5fc7813643 | |||
| dc319af254 | |||
| e920903354 | |||
| 6457394042 | |||
| 7516774474 | |||
| a9d1b2990f | |||
| 13198697a9 |
+68
-2
@@ -8,6 +8,72 @@
|
||||
:see-release-notes: If you are upgrading: please see release notes.
|
||||
:breaking: pass:quotes[*[breaking]*]
|
||||
|
||||
[[v4.3.7]]
|
||||
== Version 4.3.7 (under dev)
|
||||
|
||||
[[v4.3.7_fixed]]
|
||||
=== Fixed
|
||||
|
||||
* irc: fix send of split messages when server option "anti_flood" set to 0 (issue #2172)
|
||||
|
||||
[[v4.3.6]]
|
||||
== Version 4.3.6 (2024-08-15)
|
||||
|
||||
[[v4.3.6_fixed]]
|
||||
=== Fixed
|
||||
|
||||
* core: fix generation of TOTP on FreeBSD (issue #2171)
|
||||
* relay/api: fix crash when sending data to a remote buffer when the remote has been deleted (issue #2157)
|
||||
* relay/api: fix timezone of dates sent to clients (issue #2151)
|
||||
|
||||
[[v4.3.5]]
|
||||
== Version 4.3.5 (2024-07-16)
|
||||
|
||||
[[v4.3.5_fixed]]
|
||||
=== Fixed
|
||||
|
||||
* ruby: fix crash in plugin initialization (issue #2163)
|
||||
|
||||
[[v4.3.4]]
|
||||
== Version 4.3.4 (2024-07-03)
|
||||
|
||||
[[v4.3.4_fixed]]
|
||||
=== Fixed
|
||||
|
||||
* python: fix crash on quit with Python 3.12 (issue #2046, issue #2126)
|
||||
* core: fix crash when deleting a bar that has no items (issue #2138)
|
||||
* ruby: fix builtin functions not available (issue #2109)
|
||||
* relay/api: fix "body_type" returned when lines or nicks of a buffer are requested
|
||||
|
||||
[[v4.3.3]]
|
||||
== Version 4.3.3 (2024-06-22)
|
||||
|
||||
[[v4.3.3_fixed]]
|
||||
=== Fixed
|
||||
|
||||
* core, plugins: return "0x0" instead of "(nil)" for pointers formatted in strings
|
||||
|
||||
[[v4.3.2]]
|
||||
== Version 4.3.2 (2024-06-06)
|
||||
|
||||
[[v4.3.2_changed]]
|
||||
=== Changed
|
||||
|
||||
* relay: enable websocket extension "permessage-deflate" with "api" relay only (issue #1549)
|
||||
|
||||
[[v4.3.2_added]]
|
||||
=== Added
|
||||
|
||||
* relay: add option relay.look.raw_messages_max_length (issue #2122)
|
||||
|
||||
[[v4.3.2_fixed]]
|
||||
=== Fixed
|
||||
|
||||
* irc, xfer: fix display of input prompt in IRC private buffers and DCC chat buffers (issue #2128)
|
||||
* irc: don't return pointer to irc server if the channel or nick is not found in info "irc_buffer"
|
||||
* relay: fix websocket permessage-deflate extension when the client doesn't send the max window bits parameters (issue #1549)
|
||||
* relay: fix allocation and reinit of field "client_context_takeover" in websocket deflate structure (issue #1549)
|
||||
|
||||
[[v4.3.1]]
|
||||
== Version 4.3.1 (2024-05-31)
|
||||
|
||||
@@ -45,7 +111,7 @@
|
||||
* {breaking} core: rename variables with creation time in hdata "hotlist": "creation_time.tv_sec" to "time" and "creation_time.tv_usec" to "time_usec"
|
||||
* {breaking} api: return `-1` or `1` if one input string is NULL and not the other in string comparison functions
|
||||
* {breaking} api: use whole replacement string instead of first char in function string_remove_color
|
||||
* core: use nick offline color for nick in action message
|
||||
* core: use nick offline color for nick in action message (issue #446)
|
||||
* core: display a specific message when the value of option is unchanged after `/set` command
|
||||
* core: add variable `${highlight}` in option weechat.look.buffer_time_format (issue #2079)
|
||||
* core: reintroduce help on the variables and operators in `/help eval` (issue #2005)
|
||||
@@ -165,7 +231,7 @@ New features::
|
||||
* core: move key kbd:[Ctrl+s], kbd:[Ctrl+u] to kbd:[Alt+Shift+U] (issue #2040)
|
||||
* core: display only version with command `/version`, add options `-o` and `-ol` in command `/upgrade`
|
||||
* core: add number of processes in command `/sys waitpid`
|
||||
* core, alias, trigger: allow wildcard in commands `/bar`, `/item`, `/proxy`, `/alias` and `/trigger` (issue #1956)
|
||||
* core, alias, trigger: allow wildcard in commands `/bar`, `/filter`, `/item`, `/proxy`, `/alias` and `/trigger` (issue #1956)
|
||||
* api: add support of format/translation of command arguments description line by line (issue #2005)
|
||||
* api: add function string_concat (issue #2005)
|
||||
* api: add functions util_strftimeval, util_parse_time, printf_datetime_tags, printf_y_datetime_tags (issue #649)
|
||||
|
||||
@@ -11,6 +11,31 @@ It is recommended to read it when upgrading to a new stable version. +
|
||||
For a complete list of changes, please look at ChangeLog.
|
||||
|
||||
|
||||
[[v4.3.6]]
|
||||
== Version 4.3.6 (2024-08-15)
|
||||
|
||||
No release notes.
|
||||
|
||||
[[v4.3.5]]
|
||||
== Version 4.3.5 (2024-07-16)
|
||||
|
||||
No release notes.
|
||||
|
||||
[[v4.3.4]]
|
||||
== Version 4.3.4 (2024-07-03)
|
||||
|
||||
No release notes.
|
||||
|
||||
[[v4.3.3]]
|
||||
== Version 4.3.3 (2024-06-22)
|
||||
|
||||
No release notes.
|
||||
|
||||
[[v4.3.2]]
|
||||
== Version 4.3.2 (2024-06-06)
|
||||
|
||||
No release notes.
|
||||
|
||||
[[v4.3.1]]
|
||||
== Version 4.3.1 (2024-05-31)
|
||||
|
||||
|
||||
@@ -1,3 +1,19 @@
|
||||
weechat (4.3.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release (Closes: #1067608)
|
||||
- fix FTBFS against libgcrypt 1.11 (Closes: #1071960)
|
||||
* Add build dependency on libcjson-dev
|
||||
* Replace pkg-config build dependency by pkgconf
|
||||
* Minor updates in debian/copyright
|
||||
|
||||
-- Emmanuel Bouthenot <kolter@debian.org> Sat, 01 Jun 2024 14:21:02 +0000
|
||||
|
||||
weechat (4.1.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release (Closes: #1055278)
|
||||
|
||||
-- Emmanuel Bouthenot <kolter@debian.org> Fri, 03 Nov 2023 20:23:37 +0000
|
||||
|
||||
weechat (4.0.5-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
@@ -21,7 +21,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -14416,6 +14416,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for client description"
|
||||
msgstr "barva textu pro zvýrazněný prefix"
|
||||
|
||||
@@ -26,7 +26,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-05-24 10:45+0200\n"
|
||||
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
|
||||
"Language-Team: German <kde-i18n-de@kde.org>\n"
|
||||
@@ -2108,11 +2108,11 @@ msgstr ""
|
||||
"undOperatoren (+, -, *, /, //, %, **)"
|
||||
|
||||
msgid ""
|
||||
" - ${random:min,max}: a random integer number between \"min\" and "
|
||||
"\"max\" (inclusive)"
|
||||
" - ${random:min,max}: a random integer number between \"min\" and \"max\" "
|
||||
"(inclusive)"
|
||||
msgstr ""
|
||||
" - ${random:min,max}: eine zufällige ganze Zahl zwischen \"min\" "
|
||||
"und\"max\" (einschließlich)"
|
||||
" - ${random:min,max}: eine zufällige ganze Zahl zwischen \"min\" und\"max\" "
|
||||
"(einschließlich)"
|
||||
|
||||
msgid " - ${translate:string}: the translated string"
|
||||
msgstr " - ${translate:string}: die übersetzte Zeichenkette"
|
||||
@@ -3043,8 +3043,8 @@ msgid ""
|
||||
" raw[chat(xxx)]: chat area for buffer with name \"xxx\" (full name "
|
||||
"including plugin)"
|
||||
msgstr ""
|
||||
" raw[chat(xxx)]: Chatbereich für einen Buffer mit dem Namen "
|
||||
"\"xxx\" (vollständiger Name, mit Erweiterung)"
|
||||
" raw[chat(xxx)]: Chatbereich für einen Buffer mit dem Namen \"xxx\" "
|
||||
"(vollständiger Name, mit Erweiterung)"
|
||||
|
||||
msgid " raw[bar(*)]: any bar"
|
||||
msgstr " raw[bar(*)]: beliebige Bar"
|
||||
@@ -4976,8 +4976,8 @@ msgstr ""
|
||||
"\"-yes\" ausgeführt werden (siehe /help quit)"
|
||||
|
||||
msgid ""
|
||||
"if set, /upgrade command must be confirmed with extra argument \"-"
|
||||
"yes\" (see /help upgrade)"
|
||||
"if set, /upgrade command must be confirmed with extra argument \"-yes\" "
|
||||
"(see /help upgrade)"
|
||||
msgstr ""
|
||||
"ist diese Einstellung aktiviert, muss der \"/upgrade\" Befehl mit dem "
|
||||
"Argument \"-yes\" ausgeführt werden (siehe /help upgrade)"
|
||||
@@ -5033,10 +5033,10 @@ msgid ""
|
||||
"weechat.color.emphasized* are used"
|
||||
msgstr ""
|
||||
"Attribute um Textpassagen hervorzuheben: Das setzen von ein- oder mehreren "
|
||||
"Attributen ist möglich (\"%\" für blinkenden Text, \".\" zum "
|
||||
"\"dimmen\" (halbe Helligkeit),\"*\" für fett, \"!\" für invertiert, \"/\" "
|
||||
"für kursiv, \"_\" für unterstrichen); wenn die Zeichenkette leer ist, werden "
|
||||
"die Farben genutzt die durch weechat.color.emphasized* definiert sind"
|
||||
"Attributen ist möglich (\"%\" für blinkenden Text, \".\" zum \"dimmen\" "
|
||||
"(halbe Helligkeit),\"*\" für fett, \"!\" für invertiert, \"/\" für kursiv, "
|
||||
"\"_\" für unterstrichen); wenn die Zeichenkette leer ist, werden die Farben "
|
||||
"genutzt die durch weechat.color.emphasized* definiert sind"
|
||||
|
||||
msgid ""
|
||||
"comma separated list of words to highlight; case insensitive comparison (use "
|
||||
@@ -7008,24 +7008,24 @@ msgstr ""
|
||||
"Bedingungen um eine Infobar anzuzeigen. Eine einfache Bedingung: \"active\", "
|
||||
"\"inactive\", \"nicklist\" (Fenster muss aktiv/inaktiv sein oder der Buffer "
|
||||
"enthält eine Benutzerliste), oder man nutzt einen Ausdruck mit Bedingungen "
|
||||
"(siehe /help eval). Beispiele: \"${nicklist} && ${info:term_width} > "
|
||||
"100\" (lokale Variablen für den Ausdruck sind ${active}, ${inactive} und "
|
||||
"(siehe /help eval). Beispiele: \"${nicklist} && ${info:term_width} > 100\" "
|
||||
"(lokale Variablen für den Ausdruck sind ${active}, ${inactive} und "
|
||||
"${nicklist})"
|
||||
|
||||
msgid "bar position (bottom, top, left, right)"
|
||||
msgstr "Position der Infobar (unten, oben, links, rechts)"
|
||||
|
||||
msgid ""
|
||||
"bar filling direction (\"horizontal\" (from left to right) or "
|
||||
"\"vertical\" (from top to bottom)) when bar position is top or bottom"
|
||||
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
|
||||
"(from top to bottom)) when bar position is top or bottom"
|
||||
msgstr ""
|
||||
"Darstellung innerhalb der Infobar, falls die Infobar oben/unten angezeigt "
|
||||
"wird (\"horizontal\" (von links nach rechts) oder \"vertikal\" (von oben "
|
||||
"nach unten))"
|
||||
|
||||
msgid ""
|
||||
"bar filling direction (\"horizontal\" (from left to right) or "
|
||||
"\"vertical\" (from top to bottom)) when bar position is left or right"
|
||||
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
|
||||
"(from top to bottom)) when bar position is left or right"
|
||||
msgstr ""
|
||||
"Darstellung innerhalb der Infobar, falls die Infobar links/rechts angezeigt "
|
||||
"wird (\"horizontal\" (von links nach rechts) oder \"vertikal\" (von oben "
|
||||
@@ -7065,9 +7065,9 @@ msgid "separator line between bar and other bars/windows"
|
||||
msgstr "Trennzeichen zwischen verschieden Infobars und Fenstern"
|
||||
|
||||
msgid ""
|
||||
"items of bar, they can be separated by comma (space between items) or \"+"
|
||||
"\" (glued items); special syntax \"@buffer:item\" can be used to force "
|
||||
"buffer used when displaying the bar item"
|
||||
"items of bar, they can be separated by comma (space between items) or \"+\" "
|
||||
"(glued items); special syntax \"@buffer:item\" can be used to force buffer "
|
||||
"used when displaying the bar item"
|
||||
msgstr ""
|
||||
"Items einer Bar können entweder durch Kommata (\",\") voneinander getrennt "
|
||||
"(setzt ein Leerzeichen zwischen die Items), oder durch ein \"+\" Zeichen "
|
||||
@@ -8811,8 +8811,8 @@ msgid " - ${description}: option description (translated)"
|
||||
msgstr " - ${description}: Beschreibung der Option (übersetzt)"
|
||||
|
||||
msgid ""
|
||||
" - ${description2}: option description (translated), \"(no "
|
||||
"description)\" (translated) if there's no description"
|
||||
" - ${description2}: option description (translated), \"(no description)\" "
|
||||
"(translated) if there's no description"
|
||||
msgstr ""
|
||||
" - ${description2}: Beschreibung der Option (übersetzt), \"(keine "
|
||||
"Beschreibung)\" (übersetzt) falls keine Beschreibung vorhanden"
|
||||
@@ -9503,8 +9503,8 @@ msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: if you want to add a standard server, use the command \"/server "
|
||||
"add\" (see /help server); if you really want to add a temporary server (NOT "
|
||||
"%s%s: if you want to add a standard server, use the command \"/server add\" "
|
||||
"(see /help server); if you really want to add a temporary server (NOT "
|
||||
"SAVED), turn on the option irc.look.temporary_servers"
|
||||
msgstr ""
|
||||
"%s%s: falls ein Standardserver erstellt werden soll, muss der Befehl \"/"
|
||||
@@ -12667,8 +12667,8 @@ msgid ""
|
||||
"interval between two checks for notify with IRC command \"whois\" (in "
|
||||
"minutes)"
|
||||
msgstr ""
|
||||
"Intervall zwischen zwei notify Überprüfungen mit dem IRC Befehl "
|
||||
"\"whois\" (in Minuten)"
|
||||
"Intervall zwischen zwei notify Überprüfungen mit dem IRC Befehl \"whois\" "
|
||||
"(in Minuten)"
|
||||
|
||||
msgid ""
|
||||
"cause SASL authentication failure when SASL is requested but unavailable on "
|
||||
@@ -15016,19 +15016,19 @@ msgstr "%s%s: Interpreter kann nicht freigeben werden"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: too few arguments received from client %s%s%s for resource "
|
||||
"\"%s\" (received: %d arguments, expected: at least %d)"
|
||||
"%s%s: too few arguments received from client %s%s%s for resource \"%s\" "
|
||||
"(received: %d arguments, expected: at least %d)"
|
||||
msgstr ""
|
||||
"%s%s: Zu wenige Argumente von Client %s%s%s für die Ressource \"%s\" "
|
||||
"erhalten (Empfangen: %d Argumente, mindestens erwartet: %d)"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: too many arguments received from client %s%s%s for resource "
|
||||
"\"%s\" (received: %d arguments, expected: at most %d)"
|
||||
"%s%s: too many arguments received from client %s%s%s for resource \"%s\" "
|
||||
"(received: %d arguments, expected: at most %d)"
|
||||
msgstr ""
|
||||
"%s%s: Zu viele Argumente von Client erhalten %s%s%s für die Ressource "
|
||||
"\"%s\" (Empfangen: %d Argumente, höchstens erwartet: %d)"
|
||||
"%s%s: Zu viele Argumente von Client erhalten %s%s%s für die Ressource \"%s\" "
|
||||
"(Empfangen: %d Argumente, höchstens erwartet: %d)"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: failed to execute route \"%s %s\" for client %s%s%s"
|
||||
@@ -15784,6 +15784,11 @@ msgstr ""
|
||||
"Verbindung zum Relay herstellen oder trennen (durch Kommas getrennte Liste); "
|
||||
"erlaubte Protokolle: \"irc\", \"weechat\", \"api\""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "Textfarbe für Client-Beschreibung"
|
||||
|
||||
@@ -16107,8 +16112,8 @@ msgid ""
|
||||
"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option "
|
||||
"relay.network.tls_cert_key)"
|
||||
msgstr ""
|
||||
"%s%s: Fehler: Datei mit TLS Zertifikat/Schlüssel ist nicht lesbar: "
|
||||
"\"%s\" (Option relay.network.tls_cert_key)"
|
||||
"%s%s: Fehler: Datei mit TLS Zertifikat/Schlüssel ist nicht lesbar: \"%s\" "
|
||||
"(Option relay.network.tls_cert_key)"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: unable to initialize priority for TLS"
|
||||
@@ -16252,8 +16257,8 @@ msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: too few arguments received from client %s%s%s for command "
|
||||
"\"%s\" (received: %d arguments, expected: at least %d)"
|
||||
"%s%s: too few arguments received from client %s%s%s for command \"%s\" "
|
||||
"(received: %d arguments, expected: at least %d)"
|
||||
msgstr ""
|
||||
"%s%s: Zu wenige Argumente von Client %s%s%s für den Befehl \"%s\" erhalten "
|
||||
"(Empfangen: %d Argumente, mindestens Erwartet: %d)"
|
||||
@@ -17422,22 +17427,22 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
|
||||
#. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
|
||||
msgid ""
|
||||
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
|
||||
"<name> <hook> "
|
||||
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
|
||||
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
|
||||
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|"
|
||||
"<mask> [<name>|<mask>...]] || restart <name>|<mask> [<name>|<mask>...] || "
|
||||
"show <name> || del <name>|<mask> [<name>|<mask>...] || restore <name>|<mask> "
|
||||
"[<name>|<mask>...] || default -yes || monitor [<filter>]"
|
||||
"<name> <hook> [\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" "
|
||||
"[\"<return_code>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
|
||||
"output|recreate <name> || set <name> <option> <value> || rename|copy <name> "
|
||||
"<new_name> || enable|disable|toggle [<name>|<mask> [<name>|<mask>...]] || "
|
||||
"restart <name>|<mask> [<name>|<mask>...] || show <name> || del <name>|<mask> "
|
||||
"[<name>|<mask>...] || restore <name>|<mask> [<name>|<mask>...] || default -"
|
||||
"yes || monitor [<filter>]"
|
||||
msgstr ""
|
||||
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
|
||||
"<name> <hook> "
|
||||
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
|
||||
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
|
||||
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|"
|
||||
"<mask> [<name>|<mask>...]] || restart <name>|<mask> [<name>|<mask>...] || "
|
||||
"show <name> || del <name>|<mask> [<name>|<mask>...] || restore <name>|<mask> "
|
||||
"[<name>|<mask>...] || default -yes || monitor [<filter>]"
|
||||
"<name> <hook> [\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" "
|
||||
"[\"<return_code>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
|
||||
"output|recreate <name> || set <name> <option> <value> || rename|copy <name> "
|
||||
"<new_name> || enable|disable|toggle [<name>|<mask> [<name>|<mask>...]] || "
|
||||
"restart <name>|<mask> [<name>|<mask>...] || show <name> || del <name>|<mask> "
|
||||
"[<name>|<mask>...] || restore <name>|<mask> [<name>|<mask>...] || default -"
|
||||
"yes || monitor [<filter>]"
|
||||
|
||||
msgid "raw[list]: list triggers (without argument, this list is displayed)"
|
||||
msgstr ""
|
||||
|
||||
@@ -22,7 +22,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -14733,6 +14733,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "color del texto para la descripción del cliente"
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"PO-Revision-Date: 2024-05-23 21:02+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-06-01 22:38+0200\n"
|
||||
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"Language: fr\n"
|
||||
@@ -15489,6 +15489,14 @@ msgstr ""
|
||||
"relai qui utilisent un de ces protocoles (liste séparée par des virfules) ; "
|
||||
"protocoles autorisés : \"irc\", \"weechat\", \"api\""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
"nombre maximum de caractères à afficher dans les messages bruts (les très "
|
||||
"longs messages peuvent provoquer des lenteurs) ; 0 = afficher les messages "
|
||||
"entiers"
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "couleur du texte pour la description du client"
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -13793,6 +13793,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for client description"
|
||||
msgstr "információs pult határolóinak színe"
|
||||
|
||||
@@ -20,7 +20,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -14771,6 +14771,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "colore del testo per la descrizione del client"
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
|
||||
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
|
||||
@@ -15206,6 +15206,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "クライアント説明用のテキスト色"
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-05-25 13:34+0200\n"
|
||||
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -813,8 +813,8 @@ msgstr "%sNie można ustawić opcji \"%s\" dla proxy \"%s\""
|
||||
msgid ""
|
||||
"%sYou must confirm /%s command with extra argument \"-yes\" (see /help %s)"
|
||||
msgstr ""
|
||||
"%sMusisz potwierdzić użycie komendy /%s dodatkowym argumentem \"-"
|
||||
"yes\" (zobacz /help %s)"
|
||||
"%sMusisz potwierdzić użycie komendy /%s dodatkowym argumentem \"-yes\" "
|
||||
"(zobacz /help %s)"
|
||||
|
||||
#, c-format
|
||||
msgid "Options reloaded from %s"
|
||||
@@ -2044,8 +2044,8 @@ msgstr ""
|
||||
"*, /, //, %, **)"
|
||||
|
||||
msgid ""
|
||||
" - ${random:min,max}: a random integer number between \"min\" and "
|
||||
"\"max\" (inclusive)"
|
||||
" - ${random:min,max}: a random integer number between \"min\" and \"max\" "
|
||||
"(inclusive)"
|
||||
msgstr ""
|
||||
" - ${random:min,max}: losowa liczba całkowita z przedziału od „min” do "
|
||||
"„max” (włącznie)"
|
||||
@@ -4741,8 +4741,8 @@ msgstr ""
|
||||
"\"-yes\" (zobacz /help quit)"
|
||||
|
||||
msgid ""
|
||||
"if set, /upgrade command must be confirmed with extra argument \"-"
|
||||
"yes\" (see /help upgrade)"
|
||||
"if set, /upgrade command must be confirmed with extra argument \"-yes\" "
|
||||
"(see /help upgrade)"
|
||||
msgstr ""
|
||||
"jeśli ustawione, komenda /upgrade musi być potwierdzona dodatkowym "
|
||||
"argumentem \"-yes\" (zobacz /help upgrade)"
|
||||
@@ -6672,15 +6672,15 @@ msgid "bar position (bottom, top, left, right)"
|
||||
msgstr "pozycja paska (bottom (dół), top (góra), left (lewo), right (prawo))"
|
||||
|
||||
msgid ""
|
||||
"bar filling direction (\"horizontal\" (from left to right) or "
|
||||
"\"vertical\" (from top to bottom)) when bar position is top or bottom"
|
||||
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
|
||||
"(from top to bottom)) when bar position is top or bottom"
|
||||
msgstr ""
|
||||
"kierunek wypełniania paska (\"horizontal\" (od lewej do prawej) lub "
|
||||
"\"vertical\" (od góry do dołu)), kiedy pozycja paska to góra albo dół"
|
||||
|
||||
msgid ""
|
||||
"bar filling direction (\"horizontal\" (from left to right) or "
|
||||
"\"vertical\" (from top to bottom)) when bar position is left or right"
|
||||
"bar filling direction (\"horizontal\" (from left to right) or \"vertical\" "
|
||||
"(from top to bottom)) when bar position is left or right"
|
||||
msgstr ""
|
||||
"kierunek wypełniania paska (\"horizontal\" (od lewej do prawej) lub "
|
||||
"\"vertical\" (od góry do dołu)), kiedy pozycja paska to lewo albo prawo"
|
||||
@@ -6719,9 +6719,9 @@ msgid "separator line between bar and other bars/windows"
|
||||
msgstr "separator pomiędzy paskiem a innymi paskami/oknami"
|
||||
|
||||
msgid ""
|
||||
"items of bar, they can be separated by comma (space between items) or \"+"
|
||||
"\" (glued items); special syntax \"@buffer:item\" can be used to force "
|
||||
"buffer used when displaying the bar item"
|
||||
"items of bar, they can be separated by comma (space between items) or \"+\" "
|
||||
"(glued items); special syntax \"@buffer:item\" can be used to force buffer "
|
||||
"used when displaying the bar item"
|
||||
msgstr ""
|
||||
"elementy paska, mogą być oddzielone przecinkiem (spacja pomiędzy elementami) "
|
||||
"lub \"+\" (skleja elementy); specjalna składnia \"@buffer:item\" może być "
|
||||
@@ -7956,8 +7956,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"powłoka używana przez komendę \"/exec -sh\"; może to być nazwa powłoki jeśli "
|
||||
"znajduje się ona w PATH (na przykład \"bash\") lub ścieżka absolutna (na "
|
||||
"przykład \"/bin/bash\"); jeśli wartość jest pusta, zostanie użyte "
|
||||
"\"sh\" (uwaga: zawartość jest przetwarzana, zobacz /help eval)"
|
||||
"przykład \"/bin/bash\"); jeśli wartość jest pusta, zostanie użyte \"sh\" "
|
||||
"(uwaga: zawartość jest przetwarzana, zobacz /help eval)"
|
||||
|
||||
msgid "text color for a finished command flag in list of commands"
|
||||
msgstr "kolor tekstu dla flagi zakończonej komendy na liście komend"
|
||||
@@ -8380,8 +8380,8 @@ msgid " - ${description}: option description (translated)"
|
||||
msgstr " - ${description}: opis opcji (przetłumaczony)"
|
||||
|
||||
msgid ""
|
||||
" - ${description2}: option description (translated), \"(no "
|
||||
"description)\" (translated) if there's no description"
|
||||
" - ${description2}: option description (translated), \"(no description)\" "
|
||||
"(translated) if there's no description"
|
||||
msgstr ""
|
||||
" - ${description2}: opis opcji (przetłumaczony), „(brak opisu)” jeśli nie "
|
||||
"ma opisu"
|
||||
@@ -9046,13 +9046,13 @@ msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: if you want to add a standard server, use the command \"/server "
|
||||
"add\" (see /help server); if you really want to add a temporary server (NOT "
|
||||
"%s%s: if you want to add a standard server, use the command \"/server add\" "
|
||||
"(see /help server); if you really want to add a temporary server (NOT "
|
||||
"SAVED), turn on the option irc.look.temporary_servers"
|
||||
msgstr ""
|
||||
"%s%s: jeśli chcesz dodać standardowy serwer, użyj komendy \"/server "
|
||||
"add\" (zobacz /help server); jeśli naprawdę chcesz utworzyć serwer "
|
||||
"tymczasowy (NIE ZAPISANY), włącz opcję irc.look.temporary_servers"
|
||||
"%s%s: jeśli chcesz dodać standardowy serwer, użyj komendy \"/server add\" "
|
||||
"(zobacz /help server); jeśli naprawdę chcesz utworzyć serwer tymczasowy (NIE "
|
||||
"ZAPISANY), włącz opcję irc.look.temporary_servers"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: \"%s\" command can not be executed on a server buffer"
|
||||
@@ -11060,9 +11060,9 @@ msgid ""
|
||||
"file with ECC private key for mechanism \"ecdsa-nist256p-challenge\" (path "
|
||||
"is evaluated, see function string_eval_path_home in plugin API reference)"
|
||||
msgstr ""
|
||||
"plik z kluczem prywatnym ECC dla mechanizmu \"ecdsa-nist256p-"
|
||||
"challenge\" (ścieżka jest przetwarzana, zobacz funkcję string_eval_path_home "
|
||||
"w opisie API wtyczek)"
|
||||
"plik z kluczem prywatnym ECC dla mechanizmu \"ecdsa-nist256p-challenge\" "
|
||||
"(ścieżka jest przetwarzana, zobacz funkcję string_eval_path_home w opisie "
|
||||
"API wtyczek)"
|
||||
|
||||
msgid "timeout (in seconds) before giving up SASL authentication"
|
||||
msgstr ""
|
||||
@@ -14308,19 +14308,19 @@ msgstr "%s%s: nie można zwolnić interpretera"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: too few arguments received from client %s%s%s for resource "
|
||||
"\"%s\" (received: %d arguments, expected: at least %d)"
|
||||
"%s%s: too few arguments received from client %s%s%s for resource \"%s\" "
|
||||
"(received: %d arguments, expected: at least %d)"
|
||||
msgstr ""
|
||||
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu "
|
||||
"„%s” (otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
|
||||
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu „%s” "
|
||||
"(otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: too many arguments received from client %s%s%s for resource "
|
||||
"\"%s\" (received: %d arguments, expected: at most %d)"
|
||||
"%s%s: too many arguments received from client %s%s%s for resource \"%s\" "
|
||||
"(received: %d arguments, expected: at most %d)"
|
||||
msgstr ""
|
||||
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu "
|
||||
"„%s” (otrzymano: %d argumentów, spodziewano się: najwyżej %d)"
|
||||
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla zasobu „%s” "
|
||||
"(otrzymano: %d argumentów, spodziewano się: najwyżej %d)"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: failed to execute route \"%s %s\" for client %s%s%s"
|
||||
@@ -15068,6 +15068,11 @@ msgstr ""
|
||||
"używających jednego z tych protokołów (lista oddzielona przecinkami); "
|
||||
"dozwolone protokoły: „irc”, „weechat”, „api”"
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "kolor tekstu dla opisu klienta"
|
||||
|
||||
@@ -15206,8 +15211,8 @@ msgid ""
|
||||
"(examples: \"*\", \"pbkdf2*\", \"*,!plain\")"
|
||||
msgstr ""
|
||||
"oddzielona przecinkami lista algorytmów hashujących używanych dla "
|
||||
"uwierzytelnienia hasłem w protokole weechat, dostępne wartości: "
|
||||
"\"plain\" (hasło w postaci jawnej, nie zahashowane), \"sha256\", \"sha512\", "
|
||||
"uwierzytelnienia hasłem w protokole weechat, dostępne wartości: \"plain\" "
|
||||
"(hasło w postaci jawnej, nie zahashowane), \"sha256\", \"sha512\", "
|
||||
"\"pbkdf2+sha256\", \"pbkdf2+sha512\", \"*\" oznacza wszystkie algorytmy, "
|
||||
"nazwa zaczynająca się od \"!\" oznacza wartość negatywną w celu uniknięcia "
|
||||
"użycia algorytmu, znak \"*\" może zostać użyty w nazwie (przykłady: \"*\", "
|
||||
@@ -15375,8 +15380,8 @@ msgid ""
|
||||
"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option "
|
||||
"relay.network.tls_cert_key)"
|
||||
msgstr ""
|
||||
"%s%s: błąd: nie można odczytać pliku z certyfikatem/kluczem TLS: "
|
||||
"\"%s\" (opcja relay.network.tls_cert_key)"
|
||||
"%s%s: błąd: nie można odczytać pliku z certyfikatem/kluczem TLS: \"%s\" "
|
||||
"(opcja relay.network.tls_cert_key)"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: unable to initialize priority for TLS"
|
||||
@@ -15526,11 +15531,11 @@ msgstr "%s%s: nie udało się wykonać komendy \"%s\" dla klienta %s%s%s"
|
||||
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s%s: too few arguments received from client %s%s%s for command "
|
||||
"\"%s\" (received: %d arguments, expected: at least %d)"
|
||||
"%s%s: too few arguments received from client %s%s%s for command \"%s\" "
|
||||
"(received: %d arguments, expected: at least %d)"
|
||||
msgstr ""
|
||||
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla komendy "
|
||||
"\"%s\" (otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
|
||||
"%s%s: otrzymano za mało argumentów od klienta %s%s%s dla komendy \"%s\" "
|
||||
"(otrzymano: %d argumentów, spodziewano się: przynajmniej %d)"
|
||||
|
||||
msgid "Support of ruby scripts"
|
||||
msgstr "Wsparcie dla skryptów ruby"
|
||||
@@ -16631,23 +16636,22 @@ msgstr "zarządzaj triggerami, scyzorykiem WeeChat"
|
||||
#. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
|
||||
msgid ""
|
||||
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
|
||||
"<name> <hook> "
|
||||
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
|
||||
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
|
||||
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|"
|
||||
"<mask> [<name>|<mask>...]] || restart <name>|<mask> [<name>|<mask>...] || "
|
||||
"show <name> || del <name>|<mask> [<name>|<mask>...] || restore <name>|<mask> "
|
||||
"[<name>|<mask>...] || default -yes || monitor [<filter>]"
|
||||
"<name> <hook> [\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" "
|
||||
"[\"<return_code>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
|
||||
"output|recreate <name> || set <name> <option> <value> || rename|copy <name> "
|
||||
"<new_name> || enable|disable|toggle [<name>|<mask> [<name>|<mask>...]] || "
|
||||
"restart <name>|<mask> [<name>|<mask>...] || show <name> || del <name>|<mask> "
|
||||
"[<name>|<mask>...] || restore <name>|<mask> [<name>|<mask>...] || default -"
|
||||
"yes || monitor [<filter>]"
|
||||
msgstr ""
|
||||
"list [-o|-ol|-i|-il] || listfull || listdefault || add|addoff|addreplace "
|
||||
"<nazwa> <hook> "
|
||||
"[\"<argumenty>\" [\"<warunki>\" [\"<regex>\" [\"<komenda>\" [\"<zwracany_kod>\" [\"<post_action>\"]]]]]] "
|
||||
"|| addinput [<hook>] || input|output|recreate <nazwa> || set <nazwa> <opcja> "
|
||||
"<wartość> || rename|copy <nazwa> <nowa_nazwa> || enable|disable|toggle "
|
||||
"[<nazwa>|<maska> [<nazwa>|<maska>...]] || restart <nazwa>|<maska> [<nazwa>|"
|
||||
"<maska>...] || show <nazwa> || del <nazwa>|<maska> [<nazwa>|<maska>...] || "
|
||||
"restore <nazwa>|<maska> [<nazwa>|<maska>...] || default -yes || monitor "
|
||||
"[<filtr>]"
|
||||
"<nazwa> <hook> [\"<argumenty>\" [\"<warunki>\" [\"<regex>\" [\"<komenda>\" "
|
||||
"[\"<zwracany_kod>\" [\"<post_action>\"]]]]]] || addinput [<hook>] || input|"
|
||||
"output|recreate <nazwa> || set <nazwa> <opcja> <wartość> || rename|copy "
|
||||
"<nazwa> <nowa_nazwa> || enable|disable|toggle [<nazwa>|<maska> [<nazwa>|"
|
||||
"<maska>...]] || restart <nazwa>|<maska> [<nazwa>|<maska>...] || show <nazwa> "
|
||||
"|| del <nazwa>|<maska> [<nazwa>|<maska>...] || restore <nazwa>|<maska> "
|
||||
"[<nazwa>|<maska>...] || default -yes || monitor [<filtr>]"
|
||||
|
||||
msgid "raw[list]: list triggers (without argument, this list is displayed)"
|
||||
msgstr ""
|
||||
@@ -17023,15 +17027,14 @@ msgstr ""
|
||||
"zastępuje tekst za pomocą rozszerzonego wyrażenia regularnego POSIX "
|
||||
"(następuje to tylko wtedy, jeśli warunki są spełnione i przed wykonaniem "
|
||||
"komendy) (uwaga: zawartość jest przetwarzana, kiedy trigger jest "
|
||||
"uruchamiany, zobacz /help eval); format to: \"/regex/zastąp/"
|
||||
"zmienna\" (zmienna to zmienna w tablicy hashy do zamiany, jest to "
|
||||
"opcjonalne), wiele wyrażeń można oddzielić spacja, na przykład: \"/regex1/"
|
||||
"replace1/var1 /regex2/replace2/var2\"; wyescapowane znaki są interpretowane "
|
||||
"w wyrażeniu (na przykład \"\\n\"); separator \"/\" może być zastąpiony "
|
||||
"dowolnym znakiem (jednym lub więcej identycznych znaków); pasujące grupy "
|
||||
"mogą być użyte w zastępowaniu: ${re:0} do ${re:99}, ${re:+} dla ostatniego "
|
||||
"dopasowania i ${hide:c,${re:N}} do zastąpienia wszystkich znaków w grupie N "
|
||||
"znakiem 'c'"
|
||||
"uruchamiany, zobacz /help eval); format to: \"/regex/zastąp/zmienna\" "
|
||||
"(zmienna to zmienna w tablicy hashy do zamiany, jest to opcjonalne), wiele "
|
||||
"wyrażeń można oddzielić spacja, na przykład: \"/regex1/replace1/var1 /regex2/"
|
||||
"replace2/var2\"; wyescapowane znaki są interpretowane w wyrażeniu (na "
|
||||
"przykład \"\\n\"); separator \"/\" może być zastąpiony dowolnym znakiem "
|
||||
"(jednym lub więcej identycznych znaków); pasujące grupy mogą być użyte w "
|
||||
"zastępowaniu: ${re:0} do ${re:99}, ${re:+} dla ostatniego dopasowania i "
|
||||
"${hide:c,${re:N}} do zastąpienia wszystkich znaków w grupie N znakiem 'c'"
|
||||
|
||||
msgid ""
|
||||
"command(s) to run if conditions are OK, after regex replacements (many "
|
||||
|
||||
@@ -20,7 +20,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
|
||||
"Language-Team: Portuguese <>\n"
|
||||
@@ -15118,6 +15118,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "cor do texto da descrição do cliente"
|
||||
|
||||
|
||||
+6
-1
@@ -21,7 +21,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -14243,6 +14243,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for client description"
|
||||
msgstr "cor do texto para delimitadores de tempo"
|
||||
|
||||
@@ -21,7 +21,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -13847,6 +13847,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for client description"
|
||||
msgstr "цвет разделителей информационной панели"
|
||||
|
||||
@@ -20,7 +20,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-05-07 14:00+0400\n"
|
||||
"Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -15056,6 +15056,11 @@ msgstr ""
|
||||
"користећи један од следећих протокола (листа раздвојена запетама); дозвољени "
|
||||
"протоколи: „irc”, „weechat”, „api”"
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "боја текста за опис клијента"
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2024-04-07 14:50+0200\n"
|
||||
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -15379,6 +15379,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr "istemci açıklaması için metin rengi"
|
||||
|
||||
|
||||
+6
-1
@@ -21,7 +21,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2024-05-22 00:15+0200\n"
|
||||
"POT-Creation-Date: 2024-06-01 22:37+0200\n"
|
||||
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
|
||||
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@@ -12624,6 +12624,11 @@ msgid ""
|
||||
"\"weechat\", \"api\""
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"max number of chars to display in raw messages (very long messages can cause "
|
||||
"slowness); 0 = display whole messages"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for client description"
|
||||
msgstr ""
|
||||
|
||||
|
||||
+5
-14
@@ -38,6 +38,10 @@
|
||||
#include "core-string.h"
|
||||
#include "../plugins/plugin.h"
|
||||
|
||||
#ifdef htonll
|
||||
#define htobe64 htonll
|
||||
#endif
|
||||
|
||||
char *weecrypto_hash_algo_string[] = {
|
||||
"crc32",
|
||||
"md5",
|
||||
@@ -520,20 +524,7 @@ weecrypto_totp_generate_internal (const char *secret, int length_secret,
|
||||
int rc, offset, length;
|
||||
unsigned long bin_code;
|
||||
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
/* Big endian does not need to swap bytes here! */
|
||||
moving_factor_swapped = moving_factor;
|
||||
#else
|
||||
moving_factor_swapped = (moving_factor >> 56)
|
||||
| ((moving_factor << 40) & 0x00FF000000000000)
|
||||
| ((moving_factor << 24) & 0x0000FF0000000000)
|
||||
| ((moving_factor << 8) & 0x000000FF00000000)
|
||||
| ((moving_factor >> 8) & 0x00000000FF000000)
|
||||
| ((moving_factor >> 24) & 0x0000000000FF0000)
|
||||
| ((moving_factor >> 40) & 0x000000000000FF00)
|
||||
| (moving_factor << 56);
|
||||
#endif
|
||||
|
||||
moving_factor_swapped = htobe64 (moving_factor);
|
||||
rc = weecrypto_hmac (secret, length_secret,
|
||||
&moving_factor_swapped, sizeof (moving_factor_swapped),
|
||||
GCRY_MD_SHA1,
|
||||
|
||||
+10
-8
@@ -1149,9 +1149,9 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
|
||||
int type, debug_id;
|
||||
struct t_hashtable *hashtable;
|
||||
|
||||
EVAL_DEBUG_MSG(1, "eval_hdata_get_value(\"%s\", %p, \"%s\")",
|
||||
EVAL_DEBUG_MSG(1, "eval_hdata_get_value(\"%s\", 0x%lx, \"%s\")",
|
||||
(hdata) ? hdata->name : "(null)",
|
||||
pointer,
|
||||
(unsigned long)pointer,
|
||||
path);
|
||||
|
||||
value = NULL;
|
||||
@@ -1167,7 +1167,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
|
||||
/* no path? just return current pointer as string */
|
||||
if (!path || !path[0])
|
||||
{
|
||||
snprintf (str_value, sizeof (str_value), "%p", pointer);
|
||||
snprintf (str_value, sizeof (str_value), "0x%lx", (unsigned long)pointer);
|
||||
value = strdup (str_value);
|
||||
goto end;
|
||||
}
|
||||
@@ -1224,7 +1224,8 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
|
||||
break;
|
||||
case WEECHAT_HDATA_POINTER:
|
||||
pointer = hdata_pointer (hdata, pointer, var_name);
|
||||
snprintf (str_value, sizeof (str_value), "%p", pointer);
|
||||
snprintf (str_value, sizeof (str_value),
|
||||
"0x%lx", (unsigned long)pointer);
|
||||
value = strdup (str_value);
|
||||
break;
|
||||
case WEECHAT_HDATA_TIME:
|
||||
@@ -1273,7 +1274,7 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
|
||||
case HASHTABLE_POINTER:
|
||||
case HASHTABLE_BUFFER:
|
||||
snprintf (str_value, sizeof (str_value),
|
||||
"%p", ptr_value);
|
||||
"0x%lx", (unsigned long)ptr_value);
|
||||
value = strdup (str_value);
|
||||
break;
|
||||
case HASHTABLE_TIME:
|
||||
@@ -1288,7 +1289,8 @@ eval_hdata_get_value (struct t_hdata *hdata, void *pointer, const char *path,
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf (str_value, sizeof (str_value), "%p", pointer);
|
||||
snprintf (str_value, sizeof (str_value),
|
||||
"0x%lx", (unsigned long)pointer);
|
||||
value = strdup (str_value);
|
||||
}
|
||||
break;
|
||||
@@ -2432,8 +2434,8 @@ eval_replace_regex (const char *string, regex_t *regex, const char *replace,
|
||||
|
||||
result = NULL;
|
||||
|
||||
EVAL_DEBUG_MSG(1, "eval_replace_regex(\"%s\", %p, \"%s\")",
|
||||
string, regex, replace);
|
||||
EVAL_DEBUG_MSG(1, "eval_replace_regex(\"%s\", 0x%lx, \"%s\")",
|
||||
string, (unsigned long)regex, replace);
|
||||
|
||||
if (!string || !regex || !replace)
|
||||
goto end;
|
||||
|
||||
@@ -559,7 +559,8 @@ hashtable_to_string (enum t_hashtable_type type, const void *value)
|
||||
break;
|
||||
case HASHTABLE_POINTER:
|
||||
case HASHTABLE_BUFFER:
|
||||
snprintf (str_value, sizeof (str_value), "%p", value);
|
||||
snprintf (str_value, sizeof (str_value), "0x%lx",
|
||||
(unsigned long)value);
|
||||
return str_value;
|
||||
break;
|
||||
case HASHTABLE_TIME:
|
||||
|
||||
@@ -43,7 +43,8 @@ struct t_infolist_item;
|
||||
#define HASHTABLE_SET_POINTER(__name, __pointer) \
|
||||
if (__pointer) \
|
||||
{ \
|
||||
snprintf (str_value, sizeof (str_value), "%p", __pointer); \
|
||||
snprintf (str_value, sizeof (str_value), \
|
||||
"0x%lx", (unsigned long)__pointer); \
|
||||
hashtable_set (hashtable, __name, str_value); \
|
||||
} \
|
||||
else \
|
||||
|
||||
@@ -265,7 +265,7 @@ input_data (struct t_gui_buffer *buffer, const char *data,
|
||||
}
|
||||
|
||||
/* execute modifier "input_text_for_buffer" */
|
||||
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
|
||||
snprintf (str_buffer, sizeof (str_buffer), "0x%lx", (unsigned long)buffer);
|
||||
new_data = hook_modifier_exec (NULL,
|
||||
"input_text_for_buffer",
|
||||
str_buffer,
|
||||
|
||||
@@ -947,7 +947,7 @@ gui_bar_item_input_text_cb (const void *pointer, void *data,
|
||||
}
|
||||
|
||||
/* for modifiers */
|
||||
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
|
||||
snprintf (str_buffer, sizeof (str_buffer), "0x%lx", (unsigned long)buffer);
|
||||
|
||||
/* execute modifier with basic string (without cursor tag) */
|
||||
ptr_input = NULL;
|
||||
|
||||
+8
-1
@@ -434,7 +434,7 @@ gui_bar_check_conditions (struct t_gui_bar *bar,
|
||||
*/
|
||||
snprintf (str_modifier, sizeof (str_modifier),
|
||||
"bar_condition_%s", bar->name);
|
||||
snprintf (str_window, sizeof (str_window), "%p", window);
|
||||
snprintf (str_window, sizeof (str_window), "0x%lx", (unsigned long)window);
|
||||
str_displayed = hook_modifier_exec (NULL,
|
||||
str_modifier,
|
||||
str_window,
|
||||
@@ -788,6 +788,13 @@ gui_bar_set_items_array (struct t_gui_bar *bar, const char *items)
|
||||
&bar->items_suffix[i][j]);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
bar->items_buffer[i] = NULL;
|
||||
bar->items_prefix[i] = NULL;
|
||||
bar->items_name[i] = NULL;
|
||||
bar->items_suffix[i] = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
string_free_split (tmp_array);
|
||||
|
||||
+2
-2
@@ -677,8 +677,8 @@ gui_chat_printf_datetime_tags_internal (struct t_gui_buffer *buffer,
|
||||
if (modifier_data && string)
|
||||
{
|
||||
snprintf (modifier_data, length_data,
|
||||
"%p;%s",
|
||||
buffer,
|
||||
"0x%lx;%s",
|
||||
(unsigned long)buffer,
|
||||
(tags) ? tags : "");
|
||||
if (display_time)
|
||||
{
|
||||
|
||||
@@ -192,7 +192,7 @@ gui_history_add (struct t_gui_buffer *buffer, const char *string)
|
||||
{
|
||||
char *string2, str_buffer[128];
|
||||
|
||||
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
|
||||
snprintf (str_buffer, sizeof (str_buffer), "0x%lx", (unsigned long)buffer);
|
||||
string2 = hook_modifier_exec (NULL, "history_add", str_buffer, string);
|
||||
|
||||
/*
|
||||
|
||||
+2
-1
@@ -158,7 +158,8 @@ gui_input_text_changed_modifier_and_signal (struct t_gui_buffer *buffer,
|
||||
gui_buffer_undo_add (buffer);
|
||||
|
||||
/* send modifier, and change input if needed */
|
||||
snprintf (str_buffer, sizeof (str_buffer), "%p", buffer);
|
||||
snprintf (str_buffer, sizeof (str_buffer),
|
||||
"0x%lx", (unsigned long)buffer);
|
||||
new_input = hook_modifier_exec (NULL,
|
||||
"input_text_content",
|
||||
str_buffer,
|
||||
|
||||
@@ -69,8 +69,8 @@ gui_nicklist_send_signal (const char *signal, struct t_gui_buffer *buffer,
|
||||
if (str_args)
|
||||
{
|
||||
snprintf (str_args, length,
|
||||
"%p,%s",
|
||||
buffer,
|
||||
"0x%lx,%s",
|
||||
(unsigned long)buffer,
|
||||
(arguments) ? arguments : "");
|
||||
(void) hook_signal_send (signal,
|
||||
WEECHAT_HOOK_SIGNAL_STRING, str_args);
|
||||
|
||||
@@ -155,7 +155,7 @@ end:
|
||||
}
|
||||
|
||||
/* add pointer and plugin name */
|
||||
snprintf (str_value, sizeof (str_value), "%p", ptr_buffer);
|
||||
snprintf (str_value, sizeof (str_value), "0x%lx", (unsigned long)ptr_buffer);
|
||||
weechat_hashtable_set (info, "pointer", str_value);
|
||||
weechat_hashtable_set (info, "plugin",
|
||||
weechat_buffer_get_string (ptr_buffer, "plugin"));
|
||||
|
||||
@@ -82,7 +82,8 @@ fset_mouse_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
|
||||
if (!ptr_fset_option)
|
||||
return info;
|
||||
|
||||
snprintf (str_value, sizeof (str_value), "%p", ptr_fset_option);
|
||||
snprintf (str_value, sizeof (str_value),
|
||||
"0x%lx", (unsigned long)ptr_fset_option);
|
||||
weechat_hashtable_set (info, "fset_option", str_value);
|
||||
snprintf (str_value, sizeof (str_value), "%ld", option_index);
|
||||
weechat_hashtable_set (info, "fset_option_index", str_value);
|
||||
|
||||
@@ -742,13 +742,15 @@ weechat_guile_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
int exec_commands, const char *code)
|
||||
{
|
||||
void *func_argv[1], *result;
|
||||
int old_guile_quiet;
|
||||
|
||||
if (!guile_script_eval)
|
||||
{
|
||||
old_guile_quiet = guile_quiet;
|
||||
guile_quiet = 1;
|
||||
guile_script_eval = weechat_guile_load (WEECHAT_SCRIPT_EVAL_NAME,
|
||||
GUILE_EVAL_SCRIPT);
|
||||
guile_quiet = 0;
|
||||
guile_quiet = old_guile_quiet;
|
||||
if (!guile_script_eval)
|
||||
return 0;
|
||||
}
|
||||
@@ -777,9 +779,10 @@ weechat_guile_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
|
||||
if (!weechat_config_boolean (guile_config_look_eval_keep_context))
|
||||
{
|
||||
old_guile_quiet = guile_quiet;
|
||||
guile_quiet = 1;
|
||||
weechat_guile_unload (guile_script_eval);
|
||||
guile_quiet = 0;
|
||||
guile_quiet = old_guile_quiet;
|
||||
guile_script_eval = NULL;
|
||||
}
|
||||
|
||||
@@ -796,7 +799,7 @@ weechat_guile_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_guile_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
@@ -855,6 +858,7 @@ weechat_guile_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_guile_quiet = guile_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -884,7 +888,7 @@ weechat_guile_command_cb (const void *pointer, void *data,
|
||||
/* unload guile script */
|
||||
weechat_guile_unload_name (ptr_name);
|
||||
}
|
||||
guile_quiet = 0;
|
||||
guile_quiet = old_guile_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -1243,6 +1247,7 @@ int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
char str_version[128];
|
||||
int old_guile_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) argc;
|
||||
@@ -1316,11 +1321,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
guile_data.callback_signal_debug_dump = &weechat_guile_signal_debug_dump_cb;
|
||||
guile_data.callback_signal_script_action = &weechat_guile_signal_script_action_cb;
|
||||
guile_data.callback_load_file = &weechat_guile_load_cb;
|
||||
guile_data.init_before_autoload = NULL;
|
||||
guile_data.unload_all = &weechat_guile_unload_all;
|
||||
|
||||
old_guile_quiet = guile_quiet;
|
||||
guile_quiet = 1;
|
||||
plugin_script_init (weechat_guile_plugin, &guile_data);
|
||||
guile_quiet = 0;
|
||||
guile_quiet = old_guile_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_guile_plugin,
|
||||
guile_scripts);
|
||||
@@ -1336,7 +1343,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_guile_quiet;
|
||||
|
||||
/* unload all scripts */
|
||||
old_guile_quiet = guile_quiet;
|
||||
guile_quiet = 1;
|
||||
if (guile_script_eval)
|
||||
{
|
||||
@@ -1344,7 +1354,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
guile_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &guile_data);
|
||||
guile_quiet = 0;
|
||||
guile_quiet = old_guile_quiet;
|
||||
|
||||
/* unprotect module */
|
||||
weechat_guile_catch (scm_gc_unprotect_object, (void *)guile_module_weechat);
|
||||
|
||||
@@ -661,7 +661,8 @@ irc_bar_item_focus_buffer_nicklist (const void *pointer, void *data,
|
||||
ptr_nick = irc_nick_search (ptr_server, ptr_channel, nick);
|
||||
if (ptr_nick)
|
||||
{
|
||||
snprintf (str_value, sizeof (str_value), "%p", ptr_nick);
|
||||
snprintf (str_value, sizeof (str_value),
|
||||
"0x%lx", (unsigned long)ptr_nick);
|
||||
weechat_hashtable_set (info, "irc_nick", str_value);
|
||||
|
||||
if (ptr_nick->host)
|
||||
|
||||
@@ -49,6 +49,10 @@ char *irc_channel_typing_state_string[IRC_CHANNEL_NUM_TYPING_STATES] =
|
||||
char *irc_channel_default_chantypes = "#&";
|
||||
|
||||
|
||||
char *irc_channel_get_buffer_input_prompt (struct t_irc_server *server,
|
||||
struct t_irc_channel *channel);
|
||||
|
||||
|
||||
/*
|
||||
* Checks if a channel pointer is valid for a server.
|
||||
*
|
||||
@@ -185,7 +189,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
|
||||
struct t_hashtable *buffer_props;
|
||||
int buffer_created, current_buffer_number, buffer_position;
|
||||
int autojoin_join, manual_join, noswitch;
|
||||
char str_number[32], *channel_name_lower, *buffer_name;
|
||||
char str_number[32], *channel_name_lower, *buffer_name, *prompt;
|
||||
const char *short_name, *localvar_channel;
|
||||
|
||||
buffer_created = 0;
|
||||
@@ -225,6 +229,9 @@ irc_channel_create_buffer (struct t_irc_server *server,
|
||||
buffer_props,
|
||||
"localvar_set_type",
|
||||
(channel_type == IRC_CHANNEL_TYPE_CHANNEL) ? "channel" : "private");
|
||||
prompt = irc_channel_get_buffer_input_prompt (server, NULL);
|
||||
weechat_hashtable_set (buffer_props, "input_prompt", (prompt) ? prompt : "");
|
||||
free (prompt);
|
||||
weechat_hashtable_set (buffer_props, "localvar_set_nick", server->nick);
|
||||
weechat_hashtable_set (buffer_props, "localvar_set_host", server->host);
|
||||
weechat_hashtable_set (buffer_props, "localvar_set_server", server->name);
|
||||
@@ -611,6 +618,62 @@ irc_channel_set_buffer_modes (struct t_irc_server *server,
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Gets input prompt for a channel (channel is optional: when channel is not
|
||||
* given, the prefix for nick is not returned).
|
||||
*
|
||||
* Note: result must be freed after use.
|
||||
*/
|
||||
|
||||
char *
|
||||
irc_channel_get_buffer_input_prompt (struct t_irc_server *server,
|
||||
struct t_irc_channel *channel)
|
||||
{
|
||||
struct t_irc_nick *ptr_nick;
|
||||
int display_modes;
|
||||
char str_prefix[64], *prompt;
|
||||
|
||||
if (!server || !server->nick)
|
||||
return NULL;
|
||||
|
||||
/* build prefix */
|
||||
str_prefix[0] = '\0';
|
||||
if (channel
|
||||
&& (channel->type == IRC_CHANNEL_TYPE_CHANNEL)
|
||||
&& weechat_config_boolean (irc_config_look_item_nick_prefix))
|
||||
{
|
||||
ptr_nick = irc_nick_search (server, channel, server->nick);
|
||||
if (ptr_nick)
|
||||
{
|
||||
if (weechat_config_boolean (irc_config_look_nick_mode_empty)
|
||||
|| (ptr_nick->prefix[0] != ' '))
|
||||
{
|
||||
snprintf (str_prefix, sizeof (str_prefix), "%s%s",
|
||||
weechat_color (
|
||||
irc_nick_get_prefix_color_name (
|
||||
server, ptr_nick->prefix[0])),
|
||||
ptr_nick->prefix);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
display_modes = (weechat_config_boolean (irc_config_look_item_nick_modes)
|
||||
&& server->nick_modes && server->nick_modes[0]);
|
||||
|
||||
weechat_asprintf (&prompt, "%s%s%s%s%s%s%s%s%s",
|
||||
str_prefix,
|
||||
IRC_COLOR_INPUT_NICK,
|
||||
server->nick,
|
||||
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
|
||||
(display_modes) ? "(" : "",
|
||||
(display_modes) ? IRC_COLOR_ITEM_NICK_MODES : "",
|
||||
(display_modes) ? server->nick_modes : "",
|
||||
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
|
||||
(display_modes) ? ")" : "");
|
||||
|
||||
return prompt;
|
||||
}
|
||||
|
||||
/*
|
||||
* Sets input prompt on channel buffer.
|
||||
*/
|
||||
@@ -619,58 +682,14 @@ void
|
||||
irc_channel_set_buffer_input_prompt (struct t_irc_server *server,
|
||||
struct t_irc_channel *channel)
|
||||
{
|
||||
struct t_irc_nick *ptr_nick;
|
||||
int display_modes;
|
||||
char str_prefix[64], *prompt;
|
||||
char *prompt;
|
||||
|
||||
if (!server || !channel || !channel->buffer)
|
||||
return;
|
||||
|
||||
if (server->nick)
|
||||
{
|
||||
/* build prefix */
|
||||
str_prefix[0] = '\0';
|
||||
if (weechat_config_boolean (irc_config_look_item_nick_prefix)
|
||||
&& (channel->type == IRC_CHANNEL_TYPE_CHANNEL))
|
||||
{
|
||||
ptr_nick = irc_nick_search (server, channel, server->nick);
|
||||
if (ptr_nick)
|
||||
{
|
||||
if (weechat_config_boolean (irc_config_look_nick_mode_empty)
|
||||
|| (ptr_nick->prefix[0] != ' '))
|
||||
{
|
||||
snprintf (str_prefix, sizeof (str_prefix), "%s%s",
|
||||
weechat_color (
|
||||
irc_nick_get_prefix_color_name (
|
||||
server, ptr_nick->prefix[0])),
|
||||
ptr_nick->prefix);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
display_modes = (weechat_config_boolean (irc_config_look_item_nick_modes)
|
||||
&& server->nick_modes && server->nick_modes[0]);
|
||||
|
||||
weechat_asprintf (&prompt, "%s%s%s%s%s%s%s%s%s",
|
||||
str_prefix,
|
||||
IRC_COLOR_INPUT_NICK,
|
||||
server->nick,
|
||||
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
|
||||
(display_modes) ? "(" : "",
|
||||
(display_modes) ? IRC_COLOR_ITEM_NICK_MODES : "",
|
||||
(display_modes) ? server->nick_modes : "",
|
||||
(display_modes) ? IRC_COLOR_BAR_DELIM : "",
|
||||
(display_modes) ? ")" : "");
|
||||
if (prompt)
|
||||
{
|
||||
weechat_buffer_set (channel->buffer, "input_prompt", prompt);
|
||||
free (prompt);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
weechat_buffer_set (channel->buffer, "input_prompt", "");
|
||||
}
|
||||
prompt = irc_channel_get_buffer_input_prompt (server, channel);
|
||||
weechat_buffer_set (channel->buffer, "input_prompt", (prompt) ? prompt : "");
|
||||
free (prompt);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -57,7 +57,7 @@ irc_info_create_string_with_pointer (char **string, void *pointer)
|
||||
*string = malloc (64);
|
||||
if (*string)
|
||||
{
|
||||
snprintf (*string, 64, "%p", pointer);
|
||||
snprintf (*string, 64, "0x%lx", (unsigned long)pointer);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -298,7 +298,11 @@ irc_info_info_irc_buffer_cb (const void *pointer, void *data,
|
||||
|
||||
/* search for server or channel buffer */
|
||||
if (server && ptr_server && channel)
|
||||
{
|
||||
ptr_channel = irc_channel_search (ptr_server, channel);
|
||||
if (!ptr_channel)
|
||||
ptr_server = NULL;
|
||||
}
|
||||
|
||||
free (server);
|
||||
free (channel);
|
||||
|
||||
@@ -2988,8 +2988,14 @@ irc_server_outqueue_send (struct t_irc_server *server)
|
||||
if (!server->outqueue[priority])
|
||||
continue;
|
||||
|
||||
irc_server_outqueue_send_one_msg (server, server->outqueue[priority]);
|
||||
irc_server_outqueue_free (server, priority, server->outqueue[priority]);
|
||||
/* send all messages with anti_flood == 0, or just one */
|
||||
while (server->outqueue[priority])
|
||||
{
|
||||
irc_server_outqueue_send_one_msg (server, server->outqueue[priority]);
|
||||
irc_server_outqueue_free (server, priority, server->outqueue[priority]);
|
||||
if (anti_flood > 0)
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* continue to send for immediate priority (= 0),
|
||||
|
||||
@@ -143,8 +143,8 @@ irc_typing_channel_set_nick (struct t_irc_channel *channel, const char *nick,
|
||||
char signal_data[1024];
|
||||
|
||||
snprintf (signal_data, sizeof (signal_data),
|
||||
"%p;%s;%s",
|
||||
channel->buffer,
|
||||
"0x%lx;%s;%s",
|
||||
(unsigned long)channel->buffer,
|
||||
(state == IRC_CHANNEL_TYPING_STATE_ACTIVE) ? "typing" :
|
||||
((state == IRC_CHANNEL_TYPING_STATE_PAUSED) ? "paused" : "off"),
|
||||
nick);
|
||||
|
||||
@@ -582,7 +582,7 @@ weechat_js_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_js_quiet;
|
||||
|
||||
/* make C++ compiler happy */
|
||||
(void) pointer;
|
||||
@@ -641,6 +641,7 @@ weechat_js_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_js_quiet = js_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -670,7 +671,7 @@ weechat_js_command_cb (const void *pointer, void *data,
|
||||
/* unload javascript script */
|
||||
weechat_js_unload_name (ptr_name);
|
||||
}
|
||||
js_quiet = 0;
|
||||
js_quiet = old_js_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -920,6 +921,7 @@ EXPORT int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
char str_interpreter[64];
|
||||
int old_js_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) argc;
|
||||
@@ -953,11 +955,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
js_data.callback_signal_debug_dump = &weechat_js_signal_debug_dump_cb;
|
||||
js_data.callback_signal_script_action = &weechat_js_signal_script_action_cb;
|
||||
js_data.callback_load_file = &weechat_js_load_cb;
|
||||
js_data.init_before_autoload = NULL;
|
||||
js_data.unload_all = &weechat_js_unload_all;
|
||||
|
||||
old_js_quiet = js_quiet;
|
||||
js_quiet = 1;
|
||||
plugin_script_init (plugin, &js_data);
|
||||
js_quiet = 0;
|
||||
js_quiet = old_js_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_js_plugin, js_scripts);
|
||||
|
||||
@@ -971,6 +975,9 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
EXPORT int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_js_quiet;
|
||||
|
||||
old_js_quiet = js_quiet;
|
||||
js_quiet = 1;
|
||||
if (js_script_eval)
|
||||
{
|
||||
@@ -978,7 +985,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
js_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &js_data);
|
||||
js_quiet = 0;
|
||||
js_quiet = old_js_quiet;
|
||||
|
||||
/* free some data */
|
||||
if (js_action_install_list)
|
||||
|
||||
@@ -861,13 +861,15 @@ weechat_lua_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
int exec_commands, const char *code)
|
||||
{
|
||||
void *func_argv[1], *result;
|
||||
int old_lua_quiet;
|
||||
|
||||
if (!lua_script_eval)
|
||||
{
|
||||
old_lua_quiet = lua_quiet;
|
||||
lua_quiet = 1;
|
||||
lua_script_eval = weechat_lua_load (WEECHAT_SCRIPT_EVAL_NAME,
|
||||
LUA_EVAL_SCRIPT);
|
||||
lua_quiet = 0;
|
||||
lua_quiet = old_lua_quiet;
|
||||
if (!lua_script_eval)
|
||||
return 0;
|
||||
}
|
||||
@@ -896,9 +898,10 @@ weechat_lua_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
|
||||
if (!weechat_config_boolean (lua_config_look_eval_keep_context))
|
||||
{
|
||||
old_lua_quiet = lua_quiet;
|
||||
lua_quiet = 1;
|
||||
weechat_lua_unload (lua_script_eval);
|
||||
lua_quiet = 0;
|
||||
lua_quiet = old_lua_quiet;
|
||||
lua_script_eval = NULL;
|
||||
}
|
||||
|
||||
@@ -915,7 +918,7 @@ weechat_lua_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_lua_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
@@ -974,6 +977,7 @@ weechat_lua_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_lua_quiet = lua_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -1003,7 +1007,7 @@ weechat_lua_command_cb (const void *pointer, void *data,
|
||||
/* unload lua script */
|
||||
weechat_lua_unload_name (ptr_name);
|
||||
}
|
||||
lua_quiet = 0;
|
||||
lua_quiet = old_lua_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -1249,6 +1253,8 @@ weechat_lua_signal_script_action_cb (const void *pointer, void *data,
|
||||
int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
int old_lua_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) argc;
|
||||
(void) argv;
|
||||
@@ -1289,11 +1295,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
lua_data.callback_signal_debug_dump = &weechat_lua_signal_debug_dump_cb;
|
||||
lua_data.callback_signal_script_action = &weechat_lua_signal_script_action_cb;
|
||||
lua_data.callback_load_file = &weechat_lua_load_cb;
|
||||
lua_data.init_before_autoload = NULL;
|
||||
lua_data.unload_all = &weechat_lua_unload_all;
|
||||
|
||||
old_lua_quiet = lua_quiet;
|
||||
lua_quiet = 1;
|
||||
plugin_script_init (weechat_lua_plugin, &lua_data);
|
||||
lua_quiet = 0;
|
||||
lua_quiet = old_lua_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_lua_plugin,
|
||||
lua_scripts);
|
||||
@@ -1309,7 +1317,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_lua_quiet;
|
||||
|
||||
/* unload all scripts */
|
||||
old_lua_quiet = lua_quiet;
|
||||
lua_quiet = 1;
|
||||
if (lua_script_eval)
|
||||
{
|
||||
@@ -1317,7 +1328,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
lua_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &lua_data);
|
||||
lua_quiet = 0;
|
||||
lua_quiet = old_lua_quiet;
|
||||
|
||||
/* free some data */
|
||||
if (lua_action_install_list)
|
||||
|
||||
@@ -32,7 +32,7 @@ if(PERL_FOUND)
|
||||
add_definitions(${PERL_CFLAGS})
|
||||
include_directories(${PERL_INCLUDE_PATH})
|
||||
# ugly hack to force linking against Dynaloader.a
|
||||
string(REGEX MATCH "/[^ $]*/DynaLoader.a" PERL_DYNALOADER ${PERL_LFLAGS})
|
||||
string(REGEX MATCH "/[^ $]*/DynaLoader.a" PERL_DYNALOADER "${PERL_LFLAGS}")
|
||||
if(PERL_DYNALOADER)
|
||||
string(REPLACE "${PERL_DYNALOADER}" "" PERL_LFLAGS "${PERL_LFLAGS}")
|
||||
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PERL_LFLAGS}")
|
||||
|
||||
@@ -832,13 +832,15 @@ weechat_perl_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
int exec_commands, const char *code)
|
||||
{
|
||||
void *func_argv[1], *result;
|
||||
int old_perl_quiet;
|
||||
|
||||
if (!perl_script_eval)
|
||||
{
|
||||
old_perl_quiet = perl_quiet;
|
||||
perl_quiet = 1;
|
||||
perl_script_eval = weechat_perl_load (WEECHAT_SCRIPT_EVAL_NAME,
|
||||
PERL_EVAL_SCRIPT);
|
||||
perl_quiet = 0;
|
||||
perl_quiet = old_perl_quiet;
|
||||
if (!perl_script_eval)
|
||||
return 0;
|
||||
}
|
||||
@@ -867,9 +869,10 @@ weechat_perl_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
|
||||
if (!weechat_config_boolean (perl_config_look_eval_keep_context))
|
||||
{
|
||||
old_perl_quiet = perl_quiet;
|
||||
perl_quiet = 1;
|
||||
weechat_perl_unload (perl_script_eval);
|
||||
perl_quiet = 0;
|
||||
perl_quiet = old_perl_quiet;
|
||||
perl_script_eval = NULL;
|
||||
}
|
||||
|
||||
@@ -886,7 +889,7 @@ weechat_perl_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_perl_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
@@ -945,6 +948,7 @@ weechat_perl_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_perl_quiet = perl_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -974,7 +978,7 @@ weechat_perl_command_cb (const void *pointer, void *data,
|
||||
/* unload perl script */
|
||||
weechat_perl_unload_name (ptr_name);
|
||||
}
|
||||
perl_quiet = 0;
|
||||
perl_quiet = old_perl_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -1243,6 +1247,8 @@ weechat_perl_signal_quit_upgrade_cb (const void *pointer, void *data,
|
||||
int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
int old_perl_quiet;
|
||||
|
||||
#ifdef PERL_SYS_INIT3
|
||||
int a;
|
||||
char **perl_args_local;
|
||||
@@ -1314,11 +1320,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
perl_data.callback_signal_debug_dump = &weechat_perl_signal_debug_dump_cb;
|
||||
perl_data.callback_signal_script_action = &weechat_perl_signal_script_action_cb;
|
||||
perl_data.callback_load_file = &weechat_perl_load_cb;
|
||||
perl_data.init_before_autoload = NULL;
|
||||
perl_data.unload_all = &weechat_perl_unload_all;
|
||||
|
||||
old_perl_quiet = perl_quiet;
|
||||
perl_quiet = 1;
|
||||
plugin_script_init (weechat_perl_plugin, &perl_data);
|
||||
perl_quiet = 0;
|
||||
perl_quiet = old_perl_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_perl_plugin,
|
||||
perl_scripts);
|
||||
@@ -1337,7 +1345,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_perl_quiet;
|
||||
|
||||
/* unload all scripts */
|
||||
old_perl_quiet = perl_quiet;
|
||||
perl_quiet = 1;
|
||||
if (perl_script_eval)
|
||||
{
|
||||
@@ -1345,7 +1356,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
perl_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &perl_data);
|
||||
perl_quiet = 0;
|
||||
perl_quiet = old_perl_quiet;
|
||||
|
||||
#ifndef MULTIPLICITY
|
||||
/* free perl interpreter */
|
||||
|
||||
@@ -870,7 +870,7 @@ weechat_php_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_php_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
@@ -929,6 +929,7 @@ weechat_php_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_php_quiet = php_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -958,7 +959,7 @@ weechat_php_command_cb (const void *pointer, void *data,
|
||||
/* unload PHP script */
|
||||
weechat_php_unload_name (ptr_name);
|
||||
}
|
||||
php_quiet = 0;
|
||||
php_quiet = old_php_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -1267,6 +1268,8 @@ php_weechat_log_message (char *message)
|
||||
int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
int old_php_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) argc;
|
||||
(void) argv;
|
||||
@@ -1302,6 +1305,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
php_data.callback_signal_debug_dump = &weechat_php_signal_debug_dump_cb;
|
||||
php_data.callback_signal_script_action = &weechat_php_signal_script_action_cb;
|
||||
php_data.callback_load_file = &weechat_php_load_cb;
|
||||
php_data.init_before_autoload = NULL;
|
||||
php_data.unload_all = &weechat_php_unload_all;
|
||||
|
||||
php_embed_module.startup = php_weechat_startup;
|
||||
@@ -1314,9 +1318,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
|
||||
PG(report_zend_debug) = 0; /* Turn off --enable-debug output */
|
||||
|
||||
old_php_quiet = php_quiet;
|
||||
php_quiet = 1;
|
||||
plugin_script_init (weechat_php_plugin, &php_data);
|
||||
php_quiet = 0;
|
||||
php_quiet = old_php_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_php_plugin,
|
||||
php_scripts);
|
||||
@@ -1332,7 +1337,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_php_quiet;
|
||||
|
||||
/* unload all scripts */
|
||||
old_php_quiet = php_quiet;
|
||||
php_quiet = 1;
|
||||
if (php_script_eval)
|
||||
{
|
||||
@@ -1340,7 +1348,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
php_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &php_data);
|
||||
php_quiet = 0;
|
||||
php_quiet = old_php_quiet;
|
||||
|
||||
if (weechat_php_func_map)
|
||||
{
|
||||
|
||||
@@ -512,7 +512,7 @@ plugin_api_info_buffer_cb (const void *pointer, void *data,
|
||||
if (!ptr_buffer)
|
||||
return NULL;
|
||||
|
||||
snprintf (value, sizeof (value), "%p", ptr_buffer);
|
||||
snprintf (value, sizeof (value), "0x%lx", (unsigned long)ptr_buffer);
|
||||
return strdup (value);
|
||||
}
|
||||
|
||||
|
||||
@@ -317,6 +317,13 @@ plugin_script_init (struct t_weechat_plugin *weechat_plugin,
|
||||
&plugin_script_info_version_cb,
|
||||
weechat_plugin, NULL);
|
||||
|
||||
/*
|
||||
* call function "init_before_autoload"
|
||||
* (called even if no scripts are auto-loaded)
|
||||
*/
|
||||
if (plugin_data->init_before_autoload)
|
||||
(void)(plugin_data->init_before_autoload) ();
|
||||
|
||||
/* check if auto-load of scripts is enabled */
|
||||
info_auto_load_scripts = weechat_info_get ("auto_load_scripts", NULL);
|
||||
auto_load_scripts = (info_auto_load_scripts
|
||||
@@ -379,7 +386,7 @@ plugin_script_ptr2str (void *pointer)
|
||||
return str_pointer[index_pointer];
|
||||
|
||||
snprintf (str_pointer[index_pointer], sizeof (str_pointer[index_pointer]),
|
||||
"%p", pointer);
|
||||
"0x%lx", (unsigned long)pointer);
|
||||
|
||||
return str_pointer[index_pointer];
|
||||
}
|
||||
|
||||
@@ -122,6 +122,7 @@ struct t_plugin_script_data
|
||||
void (*callback_load_file) (void *data, const char *filename);
|
||||
|
||||
/* functions */
|
||||
void (*init_before_autoload) ();
|
||||
void (*unload_all) ();
|
||||
};
|
||||
|
||||
|
||||
@@ -1041,13 +1041,15 @@ weechat_python_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
int exec_commands, const char *code)
|
||||
{
|
||||
void *func_argv[1], *result;
|
||||
int old_python_quiet;
|
||||
|
||||
if (!python_script_eval)
|
||||
{
|
||||
old_python_quiet = python_quiet;
|
||||
python_quiet = 1;
|
||||
python_script_eval = weechat_python_load (WEECHAT_SCRIPT_EVAL_NAME,
|
||||
PYTHON_EVAL_SCRIPT);
|
||||
python_quiet = 0;
|
||||
python_quiet = old_python_quiet;
|
||||
if (!python_script_eval)
|
||||
return 0;
|
||||
}
|
||||
@@ -1076,15 +1078,33 @@ weechat_python_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
|
||||
if (!weechat_config_boolean (python_config_look_eval_keep_context))
|
||||
{
|
||||
old_python_quiet = python_quiet;
|
||||
python_quiet = 1;
|
||||
weechat_python_unload (python_script_eval);
|
||||
python_quiet = 0;
|
||||
python_quiet = old_python_quiet;
|
||||
python_script_eval = NULL;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Function called before the auto-load of scripts.
|
||||
*/
|
||||
|
||||
void
|
||||
weechat_python_init_before_autoload ()
|
||||
{
|
||||
#if PY_VERSION_HEX >= 0x030C0000 && PY_VERSION_HEX < 0x030D0000
|
||||
/*
|
||||
* Workaround for crash when ending interpreters in Python 3.12:
|
||||
* the first time we load a script, we eval an empty string.
|
||||
* See https://github.com/weechat/weechat/issues/2046
|
||||
*/
|
||||
weechat_python_eval (NULL, 0, 0, "");
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
* Callback for command "/python".
|
||||
*/
|
||||
@@ -1095,7 +1115,7 @@ weechat_python_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_python_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
@@ -1154,6 +1174,7 @@ weechat_python_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_python_quiet = python_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -1183,7 +1204,7 @@ weechat_python_command_cb (const void *pointer, void *data,
|
||||
/* unload python script */
|
||||
weechat_python_unload_name (ptr_name);
|
||||
}
|
||||
python_quiet = 0;
|
||||
python_quiet = old_python_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -1513,6 +1534,8 @@ weechat_python_signal_script_action_cb (const void *pointer, void *data,
|
||||
int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
int old_python_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) argc;
|
||||
(void) argv;
|
||||
@@ -1586,11 +1609,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
python_data.callback_signal_debug_dump = &weechat_python_signal_debug_dump_cb;
|
||||
python_data.callback_signal_script_action = &weechat_python_signal_script_action_cb;
|
||||
python_data.callback_load_file = &weechat_python_load_cb;
|
||||
python_data.init_before_autoload = &weechat_python_init_before_autoload;
|
||||
python_data.unload_all = &weechat_python_unload_all;
|
||||
|
||||
old_python_quiet = python_quiet;
|
||||
python_quiet = 1;
|
||||
plugin_script_init (weechat_python_plugin, &python_data);
|
||||
python_quiet = 0;
|
||||
python_quiet = old_python_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_python_plugin,
|
||||
python_scripts);
|
||||
@@ -1617,15 +1642,18 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_python_quiet;
|
||||
|
||||
/* unload all scripts */
|
||||
old_python_quiet = python_quiet;
|
||||
python_quiet = 1;
|
||||
plugin_script_end (plugin, &python_data);
|
||||
if (python_script_eval)
|
||||
{
|
||||
weechat_python_unload (python_script_eval);
|
||||
python_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &python_data);
|
||||
python_quiet = 0;
|
||||
python_quiet = old_python_quiet;
|
||||
|
||||
/* free python interpreter */
|
||||
if (python_mainThreadState != NULL)
|
||||
|
||||
@@ -55,16 +55,13 @@
|
||||
cJSON_Create##__json_type ( \
|
||||
weechat_hdata_##__var_type (hdata, pointer, __var_name)));
|
||||
|
||||
#define MSG_ADD_HDATA_TIME(__json_name, __var_name) \
|
||||
date = weechat_hdata_time (hdata, pointer, __var_name); \
|
||||
strftime (str_time, sizeof (str_time), "%FT%TZ", gmtime (&date)); \
|
||||
MSG_ADD_STR_BUF(__json_name, str_time);
|
||||
|
||||
#define MSG_ADD_HDATA_TIME_USEC(__json_name, \
|
||||
__var_name, __var_name_usec) \
|
||||
time_value = weechat_hdata_time (hdata, pointer, __var_name); \
|
||||
gmtime_r (&time_value, &gm_time); \
|
||||
tv.tv_sec = mktime (&gm_time); \
|
||||
local_time = localtime (&time_value); \
|
||||
time_value -= local_time->tm_gmtoff; \
|
||||
local_time = localtime (&time_value); \
|
||||
tv.tv_sec = mktime (local_time); \
|
||||
tv.tv_usec = weechat_hdata_integer (hdata, pointer, \
|
||||
__var_name_usec); \
|
||||
weechat_util_strftimeval (str_time, sizeof (str_time), \
|
||||
@@ -497,7 +494,7 @@ relay_api_msg_line_data_to_json (struct t_gui_line_data *line_data,
|
||||
int i, tags_count;
|
||||
time_t time_value;
|
||||
struct timeval tv;
|
||||
struct tm gm_time;
|
||||
struct tm *local_time;
|
||||
|
||||
hdata = relay_hdata_line_data;
|
||||
pointer = line_data;
|
||||
@@ -736,7 +733,7 @@ relay_api_msg_hotlist_to_json (struct t_gui_hotlist *hotlist)
|
||||
cJSON *json, *json_count;
|
||||
time_t time_value;
|
||||
struct timeval tv;
|
||||
struct tm gm_time;
|
||||
struct tm *local_time;
|
||||
char str_time[256], str_key[32];
|
||||
int i, array_size;
|
||||
long long buffer_id;
|
||||
|
||||
@@ -511,6 +511,8 @@ RELAY_API_PROTOCOL_CALLBACK(buffers)
|
||||
int nicks;
|
||||
enum t_relay_api_colors colors;
|
||||
|
||||
json = NULL;
|
||||
|
||||
ptr_buffer = NULL;
|
||||
if (client->http_req->num_path_items > 2)
|
||||
{
|
||||
@@ -536,6 +538,11 @@ RELAY_API_PROTOCOL_CALLBACK(buffers)
|
||||
{
|
||||
lines = relay_http_get_param_long (client->http_req, "lines", LONG_MAX);
|
||||
json = relay_api_msg_lines_to_json (ptr_buffer, lines, colors);
|
||||
if (json)
|
||||
{
|
||||
relay_api_msg_send_json (client, RELAY_HTTP_200_OK, NULL,
|
||||
"line", json);
|
||||
}
|
||||
}
|
||||
else if (strcmp (client->http_req->path_items[3], "nicks") == 0)
|
||||
{
|
||||
@@ -543,6 +550,11 @@ RELAY_API_PROTOCOL_CALLBACK(buffers)
|
||||
weechat_hdata_pointer (relay_hdata_buffer,
|
||||
ptr_buffer, "nicklist_root"),
|
||||
colors);
|
||||
if (json)
|
||||
{
|
||||
relay_api_msg_send_json (client, RELAY_HTTP_200_OK, NULL,
|
||||
"nick_group", json);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -580,13 +592,18 @@ RELAY_API_PROTOCOL_CALLBACK(buffers)
|
||||
ptr_buffer = weechat_hdata_move (relay_hdata_buffer, ptr_buffer, 1);
|
||||
}
|
||||
}
|
||||
if (json)
|
||||
{
|
||||
relay_api_msg_send_json (client, RELAY_HTTP_200_OK, NULL,
|
||||
"buffer", json);
|
||||
}
|
||||
}
|
||||
|
||||
if (!json)
|
||||
return RELAY_API_PROTOCOL_RC_MEMORY;
|
||||
|
||||
relay_api_msg_send_json (client, RELAY_HTTP_200_OK, NULL, "buffer", json);
|
||||
cJSON_Delete (json);
|
||||
|
||||
return RELAY_API_PROTOCOL_RC_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -444,14 +444,17 @@ relay_remote_event_buffer_input_cb (const void *pointer,
|
||||
struct t_gui_buffer *buffer,
|
||||
const char *input_data)
|
||||
{
|
||||
struct t_relay_remote *remote;
|
||||
struct t_relay_remote *ptr_remote;
|
||||
cJSON *json, *json_body;
|
||||
long long buffer_id;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
(void) data;
|
||||
|
||||
remote = (struct t_relay_remote *)pointer;
|
||||
ptr_remote = relay_remote_search (weechat_buffer_get_string (buffer, "localvar_relay_remote"));
|
||||
if (!ptr_remote)
|
||||
return WEECHAT_RC_OK;
|
||||
|
||||
json = NULL;
|
||||
|
||||
@@ -475,7 +478,7 @@ relay_remote_event_buffer_input_cb (const void *pointer,
|
||||
cJSON_CreateString (input_data));
|
||||
cJSON_AddItemToObject (json, "body", json_body);
|
||||
|
||||
relay_remote_network_send_json (remote, json);
|
||||
relay_remote_network_send_json (ptr_remote, json);
|
||||
|
||||
cJSON_Delete (json);
|
||||
|
||||
@@ -643,7 +646,7 @@ RELAY_REMOTE_EVENT_CALLBACK(buffer)
|
||||
{
|
||||
ptr_buffer = weechat_buffer_new_props (
|
||||
full_name, buffer_props,
|
||||
&relay_remote_event_buffer_input_cb, event->remote, NULL,
|
||||
&relay_remote_event_buffer_input_cb, NULL, NULL,
|
||||
NULL, NULL, NULL);
|
||||
apply_props = 0;
|
||||
}
|
||||
|
||||
@@ -206,7 +206,8 @@ relay_remote_network_check_auth (struct t_relay_remote *remote,
|
||||
|
||||
relay_websocket_parse_extensions (
|
||||
weechat_hashtable_get (http_resp->headers, "sec-websocket-extensions"),
|
||||
remote->ws_deflate);
|
||||
remote->ws_deflate,
|
||||
1); /* ws_deflate_allowed */
|
||||
|
||||
if (!accept_ok)
|
||||
{
|
||||
|
||||
@@ -215,7 +215,8 @@ relay_irc_sendf (struct t_relay_client *client, const char *format, ...)
|
||||
hashtable_in = NULL;
|
||||
hashtable_out = NULL;
|
||||
|
||||
snprintf (modifier_data, sizeof (modifier_data), "%p", client);
|
||||
snprintf (modifier_data, sizeof (modifier_data),
|
||||
"0x%lx", (unsigned long)client);
|
||||
new_msg1 = weechat_hook_modifier_exec ("relay_client_irc_out1",
|
||||
modifier_data, vbuffer);
|
||||
|
||||
@@ -1641,7 +1642,8 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
|
||||
data);
|
||||
}
|
||||
|
||||
snprintf (modifier_data, sizeof (modifier_data), "%p", client);
|
||||
snprintf (modifier_data, sizeof (modifier_data),
|
||||
"0x%lx", (unsigned long)client);
|
||||
new_data = weechat_hook_modifier_exec ("relay_client_irc_in",
|
||||
modifier_data, data);
|
||||
|
||||
|
||||
@@ -1620,6 +1620,8 @@ relay_client_new_with_infolist (struct t_infolist *infolist)
|
||||
new_client->ws_deflate->client_context_takeover = weechat_infolist_integer (infolist, "ws_deflate_client_context_takeover");
|
||||
new_client->ws_deflate->window_bits_deflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_deflate");
|
||||
new_client->ws_deflate->window_bits_inflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_inflate");
|
||||
new_client->ws_deflate->server_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_server_max_window_bits_recv");
|
||||
new_client->ws_deflate->client_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_client_max_window_bits_recv");
|
||||
new_client->ws_deflate->strm_deflate = NULL;
|
||||
new_client->ws_deflate->strm_inflate = NULL;
|
||||
if (weechat_infolist_search_var (infolist, "ws_deflate_strm_deflate_dict"))
|
||||
@@ -2073,6 +2075,10 @@ relay_client_add_to_infolist (struct t_infolist *infolist,
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_integer (ptr_item, "ws_deflate_window_bits_inflate", client->ws_deflate->window_bits_inflate))
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_integer (ptr_item, "ws_deflate_server_max_window_bits_recv", client->ws_deflate->server_max_window_bits_recv))
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_integer (ptr_item, "ws_deflate_client_max_window_bits_recv", client->ws_deflate->client_max_window_bits_recv))
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_pointer (ptr_item, "ws_deflate_strm_deflate", client->ws_deflate->strm_deflate))
|
||||
return 0;
|
||||
if (!weechat_infolist_new_var_pointer (ptr_item, "ws_deflate_strm_inflate", client->ws_deflate->strm_inflate))
|
||||
|
||||
@@ -59,6 +59,7 @@ struct t_config_section *relay_config_section_remote = NULL;
|
||||
struct t_config_option *relay_config_look_auto_open_buffer = NULL;
|
||||
struct t_config_option *relay_config_look_display_clients = NULL;
|
||||
struct t_config_option *relay_config_look_raw_messages = NULL;
|
||||
struct t_config_option *relay_config_look_raw_messages_max_length = NULL;
|
||||
|
||||
/* relay config, color section */
|
||||
|
||||
@@ -1455,6 +1456,13 @@ relay_config_init ()
|
||||
"buffer)"),
|
||||
NULL, 0, 65535, "256", NULL, 0,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
|
||||
relay_config_look_raw_messages_max_length = weechat_config_new_option (
|
||||
relay_config_file, relay_config_section_look,
|
||||
"raw_messages_max_length", "integer",
|
||||
N_("max number of chars to display in raw messages (very long "
|
||||
"messages can cause slowness); 0 = display whole messages"),
|
||||
NULL, 0, INT_MAX, "4096", NULL, 0,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
/* section color */
|
||||
|
||||
@@ -34,6 +34,7 @@ extern struct t_config_section *relay_config_section_path;
|
||||
|
||||
extern struct t_config_option *relay_config_look_auto_open_buffer;
|
||||
extern struct t_config_option *relay_config_look_raw_messages;
|
||||
extern struct t_config_option *relay_config_look_raw_messages_max_length;
|
||||
|
||||
extern struct t_config_option *relay_config_color_client;
|
||||
extern struct t_config_option *relay_config_color_status[];
|
||||
|
||||
@@ -385,6 +385,10 @@ error:
|
||||
/*
|
||||
* Parses and saves a HTTP header in hashtable "headers".
|
||||
*
|
||||
* The parameter "ws_deflate_allowed" controls whether the websocket extension
|
||||
* "permessage-deflate" is allowed or not (it is allowed only with "api"
|
||||
* protocol).
|
||||
*
|
||||
* Returns:
|
||||
* 1: OK, header saved
|
||||
* 0: error: invalid format
|
||||
@@ -392,7 +396,8 @@ error:
|
||||
|
||||
int
|
||||
relay_http_parse_header (struct t_relay_http_request *request,
|
||||
const char *header)
|
||||
const char *header,
|
||||
int ws_deflate_allowed)
|
||||
{
|
||||
char *pos, *name, *name_lower, *error, **items;
|
||||
const char *ptr_value;
|
||||
@@ -465,7 +470,12 @@ relay_http_parse_header (struct t_relay_http_request *request,
|
||||
* extensions
|
||||
*/
|
||||
if (strcmp (name_lower, "sec-websocket-extensions") == 0)
|
||||
relay_websocket_parse_extensions (ptr_value, request->ws_deflate);
|
||||
{
|
||||
relay_websocket_parse_extensions (
|
||||
ptr_value,
|
||||
request->ws_deflate,
|
||||
ws_deflate_allowed);
|
||||
}
|
||||
|
||||
free (name);
|
||||
free (name_lower);
|
||||
@@ -891,7 +901,7 @@ void
|
||||
relay_http_recv (struct t_relay_client *client, const char *data)
|
||||
{
|
||||
char *new_partial, *pos;
|
||||
int length;
|
||||
int length, ws_deflate_allowed;
|
||||
|
||||
if (client->partial_message)
|
||||
{
|
||||
@@ -924,8 +934,11 @@ relay_http_recv (struct t_relay_client *client, const char *data)
|
||||
}
|
||||
else
|
||||
{
|
||||
ws_deflate_allowed = (client->protocol == RELAY_PROTOCOL_API) ?
|
||||
1 : 0;
|
||||
relay_http_parse_header (client->http_req,
|
||||
client->partial_message);
|
||||
client->partial_message,
|
||||
ws_deflate_allowed);
|
||||
}
|
||||
pos[0] = '\r';
|
||||
pos++;
|
||||
|
||||
@@ -303,8 +303,9 @@ relay_raw_message_add (enum t_relay_msg_type msg_type,
|
||||
const char *peer_id,
|
||||
const char *data, int data_size)
|
||||
{
|
||||
char *raw_data, *buf, prefix[1024], prefix_arrow[16];
|
||||
int length;
|
||||
char *raw_data, *raw_data_cut, *buf, prefix[1024], prefix_arrow[16];
|
||||
const char *ptr_raw_data;
|
||||
int max_length;
|
||||
struct t_relay_raw_message *new_raw_message;
|
||||
struct timeval tv_now;
|
||||
|
||||
@@ -350,15 +351,18 @@ relay_raw_message_add (enum t_relay_msg_type msg_type,
|
||||
(peer_id && peer_id[0]) ? peer_id : "");
|
||||
}
|
||||
|
||||
length = strlen (relay_msg_type_string[msg_type]) + strlen (raw_data) + 1;
|
||||
buf = malloc (length);
|
||||
if (buf)
|
||||
raw_data_cut = NULL;
|
||||
ptr_raw_data = raw_data;
|
||||
max_length = weechat_config_integer (relay_config_look_raw_messages_max_length);
|
||||
if (max_length > 0)
|
||||
{
|
||||
snprintf (buf, length, "%s%s",
|
||||
relay_msg_type_string[msg_type],
|
||||
raw_data);
|
||||
raw_data_cut = weechat_string_cut (raw_data, max_length, 0, 0, " (...)");
|
||||
ptr_raw_data = raw_data_cut;
|
||||
}
|
||||
|
||||
weechat_asprintf (&buf, "%s%s",
|
||||
relay_msg_type_string[msg_type],
|
||||
(ptr_raw_data) ? ptr_raw_data : "");
|
||||
free (raw_data_cut);
|
||||
gettimeofday (&tv_now, NULL);
|
||||
new_raw_message = relay_raw_message_add_to_list (
|
||||
tv_now.tv_sec,
|
||||
|
||||
@@ -544,6 +544,8 @@ relay_remote_new_with_infolist (struct t_infolist *infolist)
|
||||
new_remote->ws_deflate->client_context_takeover = weechat_infolist_integer (infolist, "ws_deflate_client_context_takeover");
|
||||
new_remote->ws_deflate->window_bits_deflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_deflate");
|
||||
new_remote->ws_deflate->window_bits_inflate = weechat_infolist_integer (infolist, "ws_deflate_window_bits_inflate");
|
||||
new_remote->ws_deflate->server_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_server_max_window_bits_recv");
|
||||
new_remote->ws_deflate->client_max_window_bits_recv = weechat_infolist_integer (infolist, "ws_deflate_client_max_window_bits_recv");
|
||||
new_remote->ws_deflate->strm_deflate = NULL;
|
||||
new_remote->ws_deflate->strm_inflate = NULL;
|
||||
if (weechat_infolist_search_var (infolist, "ws_deflate_strm_deflate_dict"))
|
||||
|
||||
@@ -49,9 +49,11 @@ relay_websocket_deflate_alloc ()
|
||||
|
||||
new_ws_deflate->enabled = 0;
|
||||
new_ws_deflate->server_context_takeover = 0;
|
||||
new_ws_deflate->server_context_takeover = 0;
|
||||
new_ws_deflate->client_context_takeover = 0;
|
||||
new_ws_deflate->window_bits_deflate = 0;
|
||||
new_ws_deflate->window_bits_inflate = 0;
|
||||
new_ws_deflate->server_max_window_bits_recv = 0;
|
||||
new_ws_deflate->client_max_window_bits_recv = 0;
|
||||
new_ws_deflate->strm_deflate = NULL;
|
||||
new_ws_deflate->strm_inflate = NULL;
|
||||
|
||||
@@ -145,9 +147,11 @@ relay_websocket_deflate_reinit (struct t_relay_websocket_deflate *ws_deflate)
|
||||
{
|
||||
ws_deflate->enabled = 0;
|
||||
ws_deflate->server_context_takeover = 0;
|
||||
ws_deflate->server_context_takeover = 0;
|
||||
ws_deflate->client_context_takeover = 0;
|
||||
ws_deflate->window_bits_deflate = 0;
|
||||
ws_deflate->window_bits_inflate = 0;
|
||||
ws_deflate->server_max_window_bits_recv = 0;
|
||||
ws_deflate->client_max_window_bits_recv = 0;
|
||||
relay_websocket_deflate_free_stream_deflate (ws_deflate);
|
||||
relay_websocket_deflate_free_stream_inflate (ws_deflate);
|
||||
}
|
||||
@@ -297,7 +301,8 @@ relay_websocket_client_handshake_valid (struct t_relay_http_request *request)
|
||||
|
||||
void
|
||||
relay_websocket_parse_extensions (const char *extensions,
|
||||
struct t_relay_websocket_deflate *ws_deflate)
|
||||
struct t_relay_websocket_deflate *ws_deflate,
|
||||
int ws_deflate_allowed)
|
||||
{
|
||||
char **exts, **params, **items, *error;
|
||||
int i, j, num_exts, num_params, num_items;
|
||||
@@ -315,6 +320,7 @@ relay_websocket_parse_extensions (const char *extensions,
|
||||
params = weechat_string_split (exts[i], ";", " ", 0, 0, &num_params);
|
||||
if (params && (num_params >= 1)
|
||||
&& (strcmp (params[0], "permessage-deflate") == 0)
|
||||
&& ws_deflate_allowed
|
||||
&& (weechat_config_integer (relay_config_network_compression) > 0))
|
||||
{
|
||||
ws_deflate->enabled = 1;
|
||||
@@ -322,6 +328,8 @@ relay_websocket_parse_extensions (const char *extensions,
|
||||
ws_deflate->client_context_takeover = 1;
|
||||
ws_deflate->window_bits_deflate = 15;
|
||||
ws_deflate->window_bits_inflate = 15;
|
||||
ws_deflate->server_max_window_bits_recv = 0;
|
||||
ws_deflate->client_max_window_bits_recv = 0;
|
||||
for (j = 1; j < num_params; j++)
|
||||
{
|
||||
items = weechat_string_split (params[j], "=", " ", 0, 0, &num_items);
|
||||
@@ -356,9 +364,15 @@ relay_websocket_parse_extensions (const char *extensions,
|
||||
}
|
||||
}
|
||||
if (strcmp (items[0], "server_max_window_bits") == 0)
|
||||
{
|
||||
ws_deflate->server_max_window_bits_recv = 1;
|
||||
ws_deflate->window_bits_deflate = (int)number;
|
||||
}
|
||||
else
|
||||
{
|
||||
ws_deflate->client_max_window_bits_recv = 1;
|
||||
ws_deflate->window_bits_inflate = (int)number;
|
||||
}
|
||||
}
|
||||
}
|
||||
weechat_string_free_split (items);
|
||||
@@ -388,7 +402,7 @@ relay_websocket_build_handshake (struct t_relay_http_request *request)
|
||||
{
|
||||
const char *sec_websocket_key;
|
||||
char *key, sec_websocket_accept[128], handshake[4096], hash[160 / 8];
|
||||
char sec_websocket_extensions[512];
|
||||
char **extensions, str_window_bits[128], sec_websocket_extensions[1024];
|
||||
int length, hash_size;
|
||||
|
||||
if (!request)
|
||||
@@ -426,17 +440,41 @@ relay_websocket_build_handshake (struct t_relay_http_request *request)
|
||||
|
||||
if (request->ws_deflate->enabled)
|
||||
{
|
||||
extensions = weechat_string_dyn_alloc (128);
|
||||
if (!extensions)
|
||||
return NULL;
|
||||
weechat_string_dyn_concat (extensions, "permessage-deflate", -1);
|
||||
if (!request->ws_deflate->server_context_takeover)
|
||||
{
|
||||
weechat_string_dyn_concat (extensions, "; ", -1);
|
||||
weechat_string_dyn_concat (extensions, "server_no_context_takeover", -1);
|
||||
}
|
||||
if (!request->ws_deflate->client_context_takeover)
|
||||
{
|
||||
weechat_string_dyn_concat (extensions, "; ", -1);
|
||||
weechat_string_dyn_concat (extensions, "client_no_context_takeover", -1);
|
||||
}
|
||||
if (request->ws_deflate->server_max_window_bits_recv)
|
||||
{
|
||||
weechat_string_dyn_concat (extensions, "; ", -1);
|
||||
snprintf (str_window_bits, sizeof (str_window_bits),
|
||||
"server_max_window_bits=%d",
|
||||
request->ws_deflate->window_bits_deflate);
|
||||
weechat_string_dyn_concat (extensions, str_window_bits, -1);
|
||||
}
|
||||
if (request->ws_deflate->client_max_window_bits_recv)
|
||||
{
|
||||
weechat_string_dyn_concat (extensions, "; ", -1);
|
||||
snprintf (str_window_bits, sizeof (str_window_bits),
|
||||
"client_max_window_bits=%d",
|
||||
request->ws_deflate->window_bits_inflate);
|
||||
weechat_string_dyn_concat (extensions, str_window_bits, -1);
|
||||
}
|
||||
snprintf (
|
||||
sec_websocket_extensions, sizeof (sec_websocket_extensions),
|
||||
"Sec-WebSocket-Extensions: permessage-deflate; "
|
||||
"%s"
|
||||
"%s"
|
||||
"server_max_window_bits=%d; "
|
||||
"client_max_window_bits=%d\r\n",
|
||||
(!request->ws_deflate->server_context_takeover) ? "server_no_context_takeover; " : "",
|
||||
(!request->ws_deflate->client_context_takeover) ? "client_no_context_takeover; " : "",
|
||||
request->ws_deflate->window_bits_deflate,
|
||||
request->ws_deflate->window_bits_inflate);
|
||||
"Sec-WebSocket-Extensions: %s\r\n",
|
||||
*extensions);
|
||||
weechat_string_dyn_free (extensions, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -951,11 +989,13 @@ relay_websocket_deflate_print_log (struct t_relay_websocket_deflate *ws_deflate,
|
||||
const char *prefix)
|
||||
{
|
||||
weechat_log_printf ("%s ws_deflate:", prefix);
|
||||
weechat_log_printf ("%s enabled . . . . . . . . : %d", prefix, ws_deflate->enabled);
|
||||
weechat_log_printf ("%s server_context_takeover : %d", prefix, ws_deflate->server_context_takeover);
|
||||
weechat_log_printf ("%s client_context_takeover : %d", prefix, ws_deflate->client_context_takeover);
|
||||
weechat_log_printf ("%s window_bits_deflate . . : %d", prefix, ws_deflate->window_bits_deflate);
|
||||
weechat_log_printf ("%s window_bits_inflate . . : %d", prefix, ws_deflate->window_bits_inflate);
|
||||
weechat_log_printf ("%s strm_deflate. . . . . . : %p", prefix, ws_deflate->strm_deflate);
|
||||
weechat_log_printf ("%s strm_inflate. . . . . . : %p", prefix, ws_deflate->strm_inflate);
|
||||
weechat_log_printf ("%s enabled. . . . . . . . . . : %d", prefix, ws_deflate->enabled);
|
||||
weechat_log_printf ("%s server_context_takeover. . : %d", prefix, ws_deflate->server_context_takeover);
|
||||
weechat_log_printf ("%s client_context_takeover. . : %d", prefix, ws_deflate->client_context_takeover);
|
||||
weechat_log_printf ("%s window_bits_deflate. . . . : %d", prefix, ws_deflate->window_bits_deflate);
|
||||
weechat_log_printf ("%s window_bits_inflate. . . . : %d", prefix, ws_deflate->window_bits_inflate);
|
||||
weechat_log_printf ("%s server_max_window_bits_recv: %d", prefix, ws_deflate->server_max_window_bits_recv);
|
||||
weechat_log_printf ("%s client_max_window_bits_recv: %d", prefix, ws_deflate->client_max_window_bits_recv);
|
||||
weechat_log_printf ("%s strm_deflate . . . . . . . : %p", prefix, ws_deflate->strm_deflate);
|
||||
weechat_log_printf ("%s strm_inflate . . . . . . . : %p", prefix, ws_deflate->strm_inflate);
|
||||
}
|
||||
|
||||
@@ -49,6 +49,8 @@ struct t_relay_websocket_deflate
|
||||
/* ("server_max_window_bits") */
|
||||
int window_bits_inflate; /* window bits for client (decomp.) */
|
||||
/* ("client_max_window_bits") */
|
||||
int server_max_window_bits_recv; /* "server_max_window_bits" received?*/
|
||||
int client_max_window_bits_recv; /* "client_max_window_bits" received?*/
|
||||
z_stream *strm_deflate; /* stream for deflate (compression) */
|
||||
z_stream *strm_inflate; /* stream for inflate (decompression)*/
|
||||
};
|
||||
@@ -69,7 +71,8 @@ extern int relay_websocket_is_valid_http_get (enum t_relay_protocol protocol,
|
||||
const char *message);
|
||||
extern int relay_websocket_client_handshake_valid (struct t_relay_http_request *request);
|
||||
extern void relay_websocket_parse_extensions (const char *extensions,
|
||||
struct t_relay_websocket_deflate *ws_deflate);
|
||||
struct t_relay_websocket_deflate *ws_deflate,
|
||||
int ws_deflate_allowed);
|
||||
extern char *relay_websocket_build_handshake (struct t_relay_http_request *request);
|
||||
extern int relay_websocket_decode_frame (const unsigned char *buffer,
|
||||
unsigned long long length,
|
||||
|
||||
@@ -872,7 +872,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,short_name,"
|
||||
"nicklist,title,local_variables,"
|
||||
@@ -896,7 +897,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,type");
|
||||
relay_weechat_msg_send (ptr_client, msg);
|
||||
@@ -918,7 +920,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,"
|
||||
"prev_buffer,next_buffer");
|
||||
@@ -942,7 +945,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,"
|
||||
"prev_buffer,next_buffer");
|
||||
@@ -966,7 +970,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,"
|
||||
"prev_buffer,next_buffer");
|
||||
@@ -1010,7 +1015,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,short_name,"
|
||||
"local_variables");
|
||||
@@ -1033,7 +1039,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,title");
|
||||
relay_weechat_msg_send (ptr_client, msg);
|
||||
@@ -1055,7 +1062,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name,local_variables");
|
||||
relay_weechat_msg_send (ptr_client, msg);
|
||||
@@ -1076,7 +1084,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name");
|
||||
relay_weechat_msg_send (ptr_client, msg);
|
||||
@@ -1107,8 +1116,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"line_data:%p",
|
||||
ptr_line_data);
|
||||
"line_data:0x%lx",
|
||||
(unsigned long)ptr_line_data);
|
||||
relay_weechat_msg_add_hdata (
|
||||
msg, cmd_hdata,
|
||||
"buffer,date,date_usec,date_printed,date_usec_printed,"
|
||||
@@ -1133,7 +1142,8 @@ relay_weechat_protocol_signal_buffer_cb (const void *pointer, void *data,
|
||||
msg = relay_weechat_msg_new (str_signal);
|
||||
if (msg)
|
||||
{
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata), "buffer:%p", ptr_buffer);
|
||||
snprintf (cmd_hdata, sizeof (cmd_hdata),
|
||||
"buffer:0x%lx", (unsigned long)ptr_buffer);
|
||||
relay_weechat_msg_add_hdata (msg, cmd_hdata,
|
||||
"id,number,full_name");
|
||||
relay_weechat_msg_send (ptr_client, msg);
|
||||
|
||||
@@ -872,13 +872,15 @@ weechat_ruby_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
{
|
||||
void *func_argv[1], *result;
|
||||
char empty_arg[1] = { '\0' };
|
||||
int old_ruby_quiet;
|
||||
|
||||
if (!ruby_script_eval)
|
||||
{
|
||||
old_ruby_quiet = ruby_quiet;
|
||||
ruby_quiet = 1;
|
||||
ruby_script_eval = weechat_ruby_load (WEECHAT_SCRIPT_EVAL_NAME,
|
||||
RUBY_EVAL_SCRIPT);
|
||||
ruby_quiet = 0;
|
||||
ruby_quiet = old_ruby_quiet;
|
||||
if (!ruby_script_eval)
|
||||
return 0;
|
||||
}
|
||||
@@ -907,9 +909,10 @@ weechat_ruby_eval (struct t_gui_buffer *buffer, int send_to_buffer_as_input,
|
||||
|
||||
if (!weechat_config_boolean (ruby_config_look_eval_keep_context))
|
||||
{
|
||||
old_ruby_quiet = ruby_quiet;
|
||||
ruby_quiet = 1;
|
||||
weechat_ruby_unload (ruby_script_eval);
|
||||
ruby_quiet = 0;
|
||||
ruby_quiet = old_ruby_quiet;
|
||||
ruby_script_eval = NULL;
|
||||
}
|
||||
|
||||
@@ -926,7 +929,7 @@ weechat_ruby_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_ruby_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
@@ -985,6 +988,7 @@ weechat_ruby_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_ruby_quiet = ruby_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -1014,7 +1018,7 @@ weechat_ruby_command_cb (const void *pointer, void *data,
|
||||
/* unload ruby script */
|
||||
weechat_ruby_unload_name (ptr_name);
|
||||
}
|
||||
ruby_quiet = 0;
|
||||
ruby_quiet = old_ruby_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -1260,8 +1264,9 @@ weechat_ruby_signal_script_action_cb (const void *pointer, void *data,
|
||||
int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
int ruby_error;
|
||||
int ruby_error, old_ruby_quiet;
|
||||
VALUE err;
|
||||
char* ruby_options_argv[] = { "ruby", "-enil", NULL };
|
||||
char *weechat_ruby_code = {
|
||||
"$stdout = WeechatOutputs\n"
|
||||
"$stderr = WeechatOutputs\n"
|
||||
@@ -1360,6 +1365,8 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
|
||||
ruby_init ();
|
||||
|
||||
ruby_options (2, ruby_options_argv);
|
||||
|
||||
/* redirect stdin and stdout */
|
||||
ruby_mWeechatOutputs = rb_define_module ("WeechatOutputs");
|
||||
rb_define_singleton_method (ruby_mWeechatOutputs, "write",
|
||||
@@ -1404,11 +1411,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
ruby_data.callback_signal_debug_dump = &weechat_ruby_signal_debug_dump_cb;
|
||||
ruby_data.callback_signal_script_action = &weechat_ruby_signal_script_action_cb;
|
||||
ruby_data.callback_load_file = &weechat_ruby_load_cb;
|
||||
ruby_data.init_before_autoload = NULL;
|
||||
ruby_data.unload_all = &weechat_ruby_unload_all;
|
||||
|
||||
old_ruby_quiet = ruby_quiet;
|
||||
ruby_quiet = 1;
|
||||
plugin_script_init (weechat_ruby_plugin, &ruby_data);
|
||||
ruby_quiet = 0;
|
||||
ruby_quiet = old_ruby_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_ruby_plugin,
|
||||
ruby_scripts);
|
||||
@@ -1424,7 +1433,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_ruby_quiet;
|
||||
|
||||
/* unload all scripts */
|
||||
old_ruby_quiet = ruby_quiet;
|
||||
ruby_quiet = 1;
|
||||
if (ruby_script_eval)
|
||||
{
|
||||
@@ -1432,7 +1444,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
ruby_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &ruby_data);
|
||||
ruby_quiet = 0;
|
||||
ruby_quiet = old_ruby_quiet;
|
||||
|
||||
ruby_cleanup (0);
|
||||
signal (SIGCHLD, SIG_DFL);
|
||||
|
||||
@@ -574,7 +574,7 @@ weechat_tcl_command_cb (const void *pointer, void *data,
|
||||
int argc, char **argv, char **argv_eol)
|
||||
{
|
||||
char *ptr_name, *ptr_code, *path_script;
|
||||
int i, send_to_buffer_as_input, exec_commands;
|
||||
int i, send_to_buffer_as_input, exec_commands, old_tcl_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) pointer;
|
||||
@@ -633,6 +633,7 @@ weechat_tcl_command_cb (const void *pointer, void *data,
|
||||
|| (weechat_strcmp (argv[1], "reload") == 0)
|
||||
|| (weechat_strcmp (argv[1], "unload") == 0))
|
||||
{
|
||||
old_tcl_quiet = tcl_quiet;
|
||||
ptr_name = argv_eol[2];
|
||||
if (strncmp (ptr_name, "-q ", 3) == 0)
|
||||
{
|
||||
@@ -662,7 +663,7 @@ weechat_tcl_command_cb (const void *pointer, void *data,
|
||||
/* unload tcl script */
|
||||
weechat_tcl_unload_name (ptr_name);
|
||||
}
|
||||
tcl_quiet = 0;
|
||||
tcl_quiet = old_tcl_quiet;
|
||||
}
|
||||
else if (weechat_strcmp (argv[1], "eval") == 0)
|
||||
{
|
||||
@@ -910,6 +911,8 @@ weechat_tcl_signal_script_action_cb (const void *pointer, void *data,
|
||||
int
|
||||
weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
{
|
||||
int old_tcl_quiet;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) argc;
|
||||
(void) argv;
|
||||
@@ -945,11 +948,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
tcl_data.callback_signal_debug_dump = &weechat_tcl_signal_debug_dump_cb;
|
||||
tcl_data.callback_signal_script_action = &weechat_tcl_signal_script_action_cb;
|
||||
tcl_data.callback_load_file = &weechat_tcl_load_cb;
|
||||
tcl_data.init_before_autoload = NULL;
|
||||
tcl_data.unload_all = &weechat_tcl_unload_all;
|
||||
|
||||
old_tcl_quiet = tcl_quiet;
|
||||
tcl_quiet = 1;
|
||||
plugin_script_init (weechat_tcl_plugin, &tcl_data);
|
||||
tcl_quiet = 0;
|
||||
tcl_quiet = old_tcl_quiet;
|
||||
|
||||
plugin_script_display_short_list (weechat_tcl_plugin,
|
||||
tcl_scripts);
|
||||
@@ -965,7 +970,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
|
||||
int
|
||||
weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
{
|
||||
int old_tcl_quiet;
|
||||
|
||||
/* unload all scripts */
|
||||
old_tcl_quiet = tcl_quiet;
|
||||
tcl_quiet = 1;
|
||||
if (tcl_script_eval)
|
||||
{
|
||||
@@ -973,7 +981,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
|
||||
tcl_script_eval = NULL;
|
||||
}
|
||||
plugin_script_end (plugin, &tcl_data);
|
||||
tcl_quiet = 0;
|
||||
tcl_quiet = old_tcl_quiet;
|
||||
|
||||
/* free some data */
|
||||
if (tcl_action_install_list)
|
||||
|
||||
@@ -733,7 +733,10 @@ trigger_callback_signal_cb (const void *pointer, void *data,
|
||||
{
|
||||
str_data[0] = '\0';
|
||||
if (signal_data)
|
||||
snprintf (str_data, sizeof (str_data), "%p", signal_data);
|
||||
{
|
||||
snprintf (str_data, sizeof (str_data),
|
||||
"0x%lx", (unsigned long)signal_data);
|
||||
}
|
||||
ptr_signal_data = str_data;
|
||||
}
|
||||
weechat_hashtable_set (ctx.extra_vars, "tg_signal_data", ptr_signal_data);
|
||||
|
||||
@@ -380,6 +380,7 @@ xfer_chat_open_buffer (struct t_xfer *xfer)
|
||||
weechat_buffer_set (xfer->buffer, "short_name",
|
||||
xfer->remote_nick);
|
||||
}
|
||||
weechat_buffer_set (xfer->buffer, "input_prompt", xfer->local_nick);
|
||||
weechat_buffer_set (xfer->buffer, "localvar_set_type", "private");
|
||||
weechat_buffer_set (xfer->buffer, "localvar_set_nick", xfer->local_nick);
|
||||
weechat_buffer_set (xfer->buffer, "localvar_set_channel", xfer->remote_nick);
|
||||
|
||||
@@ -200,7 +200,7 @@ if(ICONV_LIBRARY)
|
||||
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
|
||||
list(APPEND EXTRA_LIBS "intl")
|
||||
if(HAVE_BACKTRACE)
|
||||
list(APPEND EXTRA_LIBS "execinfo")
|
||||
|
||||
@@ -1016,6 +1016,9 @@ TEST(CoreEval, EvalExpression)
|
||||
WEE_CHECK_EVAL("", "${my_null_pointer}");
|
||||
snprintf (str_value, sizeof (str_value), "%p", gui_buffers);
|
||||
WEE_CHECK_EVAL(str_value, "${my_buffer_pointer}");
|
||||
WEE_CHECK_EVAL(str_value, "${buffer}");
|
||||
WEE_CHECK_EVAL("0x0", "${buffer.prev_buffer}");
|
||||
WEE_CHECK_EVAL("0x0", "${buffer.next_buffer}");
|
||||
WEE_CHECK_EVAL("0x1234abcd", "${my_other_pointer}");
|
||||
WEE_CHECK_EVAL("", "${buffer[unknown_pointer].full_name}");
|
||||
WEE_CHECK_EVAL("", "${buffer[my_null_pointer].full_name}");
|
||||
|
||||
@@ -47,7 +47,8 @@ extern void relay_http_parse_path (const char *url,
|
||||
char ***paths, int *num_paths,
|
||||
struct t_hashtable *params);
|
||||
extern int relay_http_parse_header (struct t_relay_http_request *request,
|
||||
const char *header);
|
||||
const char *header,
|
||||
int ws_deflate_allowed);
|
||||
extern void relay_http_add_to_body (struct t_relay_http_request *request,
|
||||
char **partial_message);
|
||||
extern int relay_http_get_auth_status (struct t_relay_client *client);
|
||||
@@ -103,7 +104,7 @@ TEST(RelayHttp, RequestAllocReinitFree)
|
||||
CHECK(request->ws_deflate);
|
||||
LONGS_EQUAL(0, request->ws_deflate->enabled);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate);
|
||||
POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
|
||||
@@ -146,7 +147,7 @@ TEST(RelayHttp, RequestAllocReinitFree)
|
||||
CHECK(request->ws_deflate);
|
||||
LONGS_EQUAL(0, request->ws_deflate->enabled);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate);
|
||||
POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
|
||||
@@ -478,7 +479,7 @@ TEST(RelayHttp, ParseHeader)
|
||||
request = relay_http_request_alloc ();
|
||||
CHECK(request);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
relay_http_parse_header (request, NULL);
|
||||
relay_http_parse_header (request, NULL, 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_END, request->status);
|
||||
STRCMP_EQUAL("GET /api/version\n"
|
||||
"\n",
|
||||
@@ -489,7 +490,7 @@ TEST(RelayHttp, ParseHeader)
|
||||
request = relay_http_request_alloc ();
|
||||
CHECK(request);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
relay_http_parse_header (request, "");
|
||||
relay_http_parse_header (request, "", 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_END, request->status);
|
||||
STRCMP_EQUAL("GET /api/version\n"
|
||||
"\n",
|
||||
@@ -500,7 +501,7 @@ TEST(RelayHttp, ParseHeader)
|
||||
request = relay_http_request_alloc ();
|
||||
CHECK(request);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
relay_http_parse_header (request, "Test");
|
||||
relay_http_parse_header (request, "Test", 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
|
||||
STRCMP_EQUAL("GET /api/version\n"
|
||||
"Test\n",
|
||||
@@ -511,7 +512,7 @@ TEST(RelayHttp, ParseHeader)
|
||||
request = relay_http_request_alloc ();
|
||||
CHECK(request);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
relay_http_parse_header (request, "X-Test: value");
|
||||
relay_http_parse_header (request, "X-Test: value", 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
|
||||
STRCMP_EQUAL("GET /api/version\n"
|
||||
"X-Test: value\n",
|
||||
@@ -523,7 +524,7 @@ TEST(RelayHttp, ParseHeader)
|
||||
request = relay_http_request_alloc ();
|
||||
CHECK(request);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br");
|
||||
relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br", 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
|
||||
STRCMP_EQUAL("GET /api/version\n"
|
||||
"Accept-Encoding: gzip, zstd, br\n",
|
||||
@@ -540,7 +541,7 @@ TEST(RelayHttp, ParseHeader)
|
||||
request = relay_http_request_alloc ();
|
||||
CHECK(request);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
relay_http_parse_header (request, "Content-Length: 123");
|
||||
relay_http_parse_header (request, "Content-Length: 123", 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
|
||||
STRCMP_EQUAL("GET /api/version\n"
|
||||
"Content-Length: 123\n",
|
||||
@@ -555,7 +556,8 @@ TEST(RelayHttp, ParseHeader)
|
||||
relay_http_parse_method_path (request, "GET /api HTTP/1.1");
|
||||
relay_http_parse_header (
|
||||
request,
|
||||
"Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits");
|
||||
"Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits",
|
||||
1);
|
||||
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
|
||||
STRCMP_EQUAL(
|
||||
"GET /api HTTP/1.1\n"
|
||||
@@ -565,7 +567,7 @@ TEST(RelayHttp, ParseHeader)
|
||||
CHECK(request->ws_deflate);
|
||||
LONGS_EQUAL(1, request->ws_deflate->enabled);
|
||||
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate);
|
||||
POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate);
|
||||
@@ -589,8 +591,8 @@ TEST(RelayHttp, AddToBody)
|
||||
LONGS_EQUAL(RELAY_HTTP_METHOD, request->status);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
|
||||
relay_http_parse_header (request, "Content-Length: 10");
|
||||
relay_http_parse_header (request, "");
|
||||
relay_http_parse_header (request, "Content-Length: 10", 1);
|
||||
relay_http_parse_header (request, "", 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_BODY, request->status);
|
||||
LONGS_EQUAL(10, request->content_length);
|
||||
LONGS_EQUAL(0, request->body_size);
|
||||
@@ -616,8 +618,8 @@ TEST(RelayHttp, AddToBody)
|
||||
LONGS_EQUAL(RELAY_HTTP_METHOD, request->status);
|
||||
relay_http_parse_method_path (request, "GET /api/version");
|
||||
LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status);
|
||||
relay_http_parse_header (request, "Content-Length: 5");
|
||||
relay_http_parse_header (request, "");
|
||||
relay_http_parse_header (request, "Content-Length: 5", 1);
|
||||
relay_http_parse_header (request, "", 1);
|
||||
LONGS_EQUAL(RELAY_HTTP_BODY, request->status);
|
||||
LONGS_EQUAL(5, request->content_length);
|
||||
LONGS_EQUAL(0, request->body_size);
|
||||
|
||||
@@ -62,9 +62,11 @@ TEST(RelayWebsocket, DeflateAllocFree)
|
||||
ws_deflate = relay_websocket_deflate_alloc ();
|
||||
LONGS_EQUAL(0, ws_deflate->enabled);
|
||||
LONGS_EQUAL(0, ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(0, ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(0, ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(0, ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(0, ws_deflate->window_bits_inflate);
|
||||
LONGS_EQUAL(0, ws_deflate->server_max_window_bits_recv);
|
||||
LONGS_EQUAL(0, ws_deflate->client_max_window_bits_recv);
|
||||
POINTERS_EQUAL(NULL, ws_deflate->strm_deflate);
|
||||
POINTERS_EQUAL(NULL, ws_deflate->strm_inflate);
|
||||
|
||||
@@ -163,34 +165,80 @@ TEST(RelayWebsocket, ClientHandshakeValid)
|
||||
LONGS_EQUAL(-2, relay_websocket_client_handshake_valid (request));
|
||||
hashtable_set (request->headers, "origin", "example.com");
|
||||
LONGS_EQUAL(0, relay_websocket_client_handshake_valid (request));
|
||||
config_file_option_reset (relay_config_network_websocket_allowed_origins, 1);
|
||||
|
||||
relay_websocket_deflate_reinit (request->ws_deflate);
|
||||
relay_websocket_parse_extensions ("permessage-deflate", request->ws_deflate, 1);
|
||||
LONGS_EQUAL(1, request->ws_deflate->enabled);
|
||||
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_max_window_bits_recv);
|
||||
LONGS_EQUAL(0, request->ws_deflate->client_max_window_bits_recv);
|
||||
WEE_TEST_STR(
|
||||
"HTTP/1.1 101 Switching Protocols\r\n"
|
||||
"Upgrade: websocket\r\n"
|
||||
"Connection: Upgrade\r\n"
|
||||
"Sec-WebSocket-Accept: fhLJYtv//ugX2vQXpifQgByRZ5Y=\r\n"
|
||||
"Sec-WebSocket-Extensions: permessage-deflate\r\n"
|
||||
"\r\n",
|
||||
relay_websocket_build_handshake (request));
|
||||
|
||||
relay_websocket_deflate_reinit (request->ws_deflate);
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits",
|
||||
request->ws_deflate);
|
||||
request->ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, request->ws_deflate->enabled);
|
||||
LONGS_EQUAL(1, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_max_window_bits_recv);
|
||||
LONGS_EQUAL(1, request->ws_deflate->client_max_window_bits_recv);
|
||||
WEE_TEST_STR(
|
||||
"HTTP/1.1 101 Switching Protocols\r\n"
|
||||
"Upgrade: websocket\r\n"
|
||||
"Connection: Upgrade\r\n"
|
||||
"Sec-WebSocket-Accept: fhLJYtv//ugX2vQXpifQgByRZ5Y=\r\n"
|
||||
"Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15\r\n"
|
||||
"Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits=15\r\n"
|
||||
"\r\n",
|
||||
relay_websocket_build_handshake (request));
|
||||
|
||||
relay_websocket_deflate_reinit (request->ws_deflate);
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits = 12; server_no_context_takeover",
|
||||
request->ws_deflate);
|
||||
request->ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, request->ws_deflate->enabled);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(1, request->ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(12, request->ws_deflate->window_bits_inflate);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_max_window_bits_recv);
|
||||
LONGS_EQUAL(1, request->ws_deflate->client_max_window_bits_recv);
|
||||
WEE_TEST_STR(
|
||||
"HTTP/1.1 101 Switching Protocols\r\n"
|
||||
"Upgrade: websocket\r\n"
|
||||
"Connection: Upgrade\r\n"
|
||||
"Sec-WebSocket-Accept: fhLJYtv//ugX2vQXpifQgByRZ5Y=\r\n"
|
||||
"Sec-WebSocket-Extensions: permessage-deflate; server_no_context_takeover; server_max_window_bits=15; client_max_window_bits=12\r\n"
|
||||
"Sec-WebSocket-Extensions: permessage-deflate; server_no_context_takeover; client_max_window_bits=12\r\n"
|
||||
"\r\n",
|
||||
relay_websocket_build_handshake (request));
|
||||
|
||||
relay_websocket_deflate_reinit (request->ws_deflate);
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits = 12; server_max_window_bits=8; client_no_context_takeover; server_no_context_takeover",
|
||||
request->ws_deflate);
|
||||
request->ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, request->ws_deflate->enabled);
|
||||
LONGS_EQUAL(0, request->ws_deflate->server_context_takeover);
|
||||
LONGS_EQUAL(0, request->ws_deflate->client_context_takeover);
|
||||
LONGS_EQUAL(8, request->ws_deflate->window_bits_deflate);
|
||||
LONGS_EQUAL(12, request->ws_deflate->window_bits_inflate);
|
||||
LONGS_EQUAL(1, request->ws_deflate->server_max_window_bits_recv);
|
||||
LONGS_EQUAL(1, request->ws_deflate->client_max_window_bits_recv);
|
||||
WEE_TEST_STR(
|
||||
"HTTP/1.1 101 Switching Protocols\r\n"
|
||||
"Upgrade: websocket\r\n"
|
||||
@@ -212,16 +260,26 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
{
|
||||
struct t_relay_websocket_deflate ws_deflate;
|
||||
|
||||
relay_websocket_parse_extensions (NULL, NULL);
|
||||
relay_websocket_parse_extensions ("test", NULL);
|
||||
relay_websocket_parse_extensions (NULL, &ws_deflate);
|
||||
relay_websocket_parse_extensions (NULL, NULL, 1);
|
||||
relay_websocket_parse_extensions ("test", NULL, 1);
|
||||
relay_websocket_parse_extensions (NULL, &ws_deflate, 1);
|
||||
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions ("test", &ws_deflate);
|
||||
relay_websocket_parse_extensions ("test", &ws_deflate, 1);
|
||||
LONGS_EQUAL(0, ws_deflate.enabled);
|
||||
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions ("permessage-deflate", &ws_deflate);
|
||||
relay_websocket_parse_extensions ("permessage-deflate", &ws_deflate, 0);
|
||||
LONGS_EQUAL(0, ws_deflate.enabled);
|
||||
LONGS_EQUAL(0, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(0, ws_deflate.client_context_takeover);
|
||||
LONGS_EQUAL(0, ws_deflate.window_bits_deflate);
|
||||
LONGS_EQUAL(0, ws_deflate.window_bits_inflate);
|
||||
POINTERS_EQUAL(NULL, ws_deflate.strm_deflate);
|
||||
POINTERS_EQUAL(NULL, ws_deflate.strm_inflate);
|
||||
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions ("permessage-deflate", &ws_deflate, 1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -232,7 +290,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions ("permessage-deflate; client_max_window_bits",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -245,7 +304,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits=4",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -258,7 +318,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits=30",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -271,7 +332,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits=test",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -283,7 +345,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits=9",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -295,7 +358,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
memset (&ws_deflate, 0, sizeof (ws_deflate));
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits=9; server_max_window_bits=10",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(1, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -308,7 +372,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits=9; server_max_window_bits=10; "
|
||||
"server_no_context_takeover",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(0, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(1, ws_deflate.client_context_takeover);
|
||||
@@ -321,7 +386,8 @@ TEST(RelayWebsocket, ParseExtensions)
|
||||
relay_websocket_parse_extensions (
|
||||
"permessage-deflate; client_max_window_bits=9; server_max_window_bits=10; "
|
||||
"server_no_context_takeover; client_no_context_takeover",
|
||||
&ws_deflate);
|
||||
&ws_deflate,
|
||||
1);
|
||||
LONGS_EQUAL(1, ws_deflate.enabled);
|
||||
LONGS_EQUAL(0, ws_deflate.server_context_takeover);
|
||||
LONGS_EQUAL(0, ws_deflate.client_context_takeover);
|
||||
|
||||
+2
-2
@@ -39,8 +39,8 @@
|
||||
# devel-number the devel version as hex number ("0x04010000" for "4.1.0-dev")
|
||||
#
|
||||
|
||||
weechat_stable="4.3.1"
|
||||
weechat_devel="4.3.1"
|
||||
weechat_stable="4.3.6"
|
||||
weechat_devel="4.3.7-dev"
|
||||
|
||||
stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)
|
||||
stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2)
|
||||
|
||||
Reference in New Issue
Block a user