From 0dab9b9257b557fb6377d68c17ff4870f7eda524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 1 Nov 2025 16:02:53 +0100 Subject: [PATCH] irc: display a warning for each unknown or invalid server option in commands /connect and /server --- CHANGELOG.md | 1 + po/cs.po | 10 ++++- po/de.po | 13 ++++++- po/es.po | 13 ++++++- po/fr.po | 14 ++++++- po/hu.po | 10 ++++- po/it.po | 12 +++++- po/ja.po | 11 +++++- po/pl.po | 12 +++++- po/pt.po | 11 +++++- po/pt_BR.po | 11 +++++- po/ru.po | 10 ++++- po/sr.po | 12 +++++- po/tr.po | 12 +++++- po/weechat.pot | 10 ++++- src/plugins/irc/irc-server.c | 72 ++++++++++++++++++++++-------------- 16 files changed, 191 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26221d56f..da4339013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - api: fix parsing of date/times with timezone offset in function util_parse_time - irc: fix warning on creation of irc.msgbuffer option when the server name contains upper case letters ([#2281](https://github.com/weechat/weechat/issues/2281)) +- irc: display a warning for each unknown or invalid server option in commands /connect and /server - relay/api: fix crash when an invalid HTTP request is received from a client ## Version 4.7.1 (2025-08-16) diff --git a/po/cs.po b/po/cs.po index d0e7373a1..bca53e5f7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:26+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -12550,6 +12550,14 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s%s: chyba při alokování nového serveru" +#, fuzzy, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sChyba: nemohu nastavit volbu \"%s\" pro pole \"%s\"" + +#, fuzzy, c-format +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%sUpozornění: %s, řádek %d: neznámý identifikátor sekce (\"%s\")" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/de.po b/po/de.po index cdb2e0ec8..f7445dab9 100644 --- a/po/de.po +++ b/po/de.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:26+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -13885,6 +13885,17 @@ msgstr "TLS:" msgid "%s%s: error when allocating new server" msgstr "%s%s: Neuer Server konnte nicht alloziert werden" +#, fuzzy, c-format +#| msgid "%sUnable to set option \"%s\" for bar \"%s\"" +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sDie Option \"%s\" kann für die Bar \"%s\" nicht gesetzt werden" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "" +"%sWarnung: unbekannte Einstellung für Sektion \"%s\": %s (Wert: \"%s\")" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/es.po b/po/es.po index 03cacbaf8..96c3ba0b4 100644 --- a/po/es.po +++ b/po/es.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:26+0100\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -12859,6 +12859,17 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s%s: no hay suficiente memoria para crear el nuevo servidor" +#, fuzzy, c-format +#| msgid "%sUnable to set option \"%s\" for bar \"%s\"" +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sError: no se pudo configurar la opción \"%s\" en la barra \"%s\"" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "" +"%sAtención: opción desconocida para la sección \"%s\": %s (valor: \"%s\")" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/fr.po b/po/fr.po index d5043b3fe..d550b555d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" -"PO-Revision-Date: 2025-10-27 08:26+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" +"PO-Revision-Date: 2025-11-01 16:00+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -13600,6 +13600,16 @@ msgstr "TLS :" msgid "%s%s: error when allocating new server" msgstr "%s%s : impossible d'allouer un nouveau serveur" +#, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "" +"%s%s : attention : impossible de modifier l'option \"%s\" pour le serveur " +"\"%s\"" + +#, c-format +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%s%s : attention : option \"%s\" inconnue pour le serveur \"%s\"" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/hu.po b/po/hu.po index f54c43c79..7b930072b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:27+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -12009,6 +12009,14 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s az új szerver lefoglalása sikertelen\n" +#, fuzzy, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%s ismeretlen opció a \"%s\" parancsnak\n" + +#, fuzzy, c-format +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%s %s, %d. sor: ismeretlen csoportazonosító (\"%s\")\n" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/it.po b/po/it.po index fc41e08d6..6da12f104 100644 --- a/po/it.po +++ b/po/it.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:27+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -12867,6 +12867,16 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s%s: errore durante l'allocazione del nuovo server" +#, fuzzy, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sErrore: impossibile impostare l'opzione \"%s\" per la barra \"%s\"" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "" +"%sAttenzione: opzione sconosciuta per la sezione \"%s\": %s (valore: \"%s\")" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/ja.po b/po/ja.po index 89b6e98cf..e8b95815d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:27+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: weechat-dev \n" @@ -13563,6 +13563,16 @@ msgstr "TLS:" msgid "%s%s: error when allocating new server" msgstr "%s%s: błąd podczas przydzielania nowego serwera" +#, fuzzy, c-format +#| msgid "%sUnable to set option \"%s\" for bar \"%s\"" +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sNie można ustawić opcji \"%s\" dla paska \"%s\"" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%sOstrzeżenie: nieznana opcja dla sekcji \"%s\": %s (wartość: \"%s\")" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/pt.po b/po/pt.po index b9cabd09d..5648ab8a1 100644 --- a/po/pt.po +++ b/po/pt.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:27+0100\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -13253,6 +13253,15 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s%s: erro ao alocar novo servidor" +#, fuzzy, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sErro: não foi possível definir a opção \"%s\" da barra \"%s\"" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%sAviso: opção desconhecida na secção \"%s\": %s (valor: \"%s\")" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/pt_BR.po b/po/pt_BR.po index 0edbf6192..b56dac0aa 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:27+0100\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -12390,6 +12390,15 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s%s: erro ao alocar novo servidor" +#, fuzzy, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sErro: não foi possível configurar a opção \"%s\" para a barra \"%s\"" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%sAviso: opção desconhecida para seção \"%s\": %s (valor: \"%s\")" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/ru.po b/po/ru.po index 55cccb777..59299bf88 100644 --- a/po/ru.po +++ b/po/ru.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:27+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -12065,6 +12065,14 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s не могу расположить новый сервер\n" +#, fuzzy, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%s неизвестный параметр для команды \"%s\"\n" + +#, fuzzy, c-format +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%s %s, строка %d: неизвестный идентификатор секции (\"%s\")\n" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/sr.po b/po/sr.po index 51b828f3b..234bfd061 100644 --- a/po/sr.po +++ b/po/sr.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-31 11:14+0400\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -13195,6 +13195,16 @@ msgstr "TLS:" msgid "%s%s: error when allocating new server" msgstr "%s%s: грешка приликом алокације новог сервера" +#, fuzzy, c-format +#| msgid "%sUnable to set option \"%s\" for bar \"%s\"" +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sПостављање опције „%s” за траку „%s” није успело" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%sУпозорење: непозната опција за одељак „%s”: %s (вредност: „%s”)" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/tr.po b/po/tr.po index b7fa75d3b..0734206e3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2025-10-27 08:27+0100\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -13412,6 +13412,16 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "%s%s: Yeni sunucu için yer açılırken hata" +#, fuzzy, c-format +#| msgid "%sUnable to set option \"%s\" for bar \"%s\"" +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "%sŞu çubuk için \"%s\" seçeneği ayarlanamadı: \"%s\"" + +#, fuzzy, c-format +#| msgid "%sWarning: unknown option for section \"%s\": %s (value: \"%s\")" +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "%sUyarı: \"%s\" bölümü için geçersiz seçenek: %s (değer: \"%s\"" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/po/weechat.pot b/po/weechat.pot index aa74d3623..e25ad5dd2 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2025-10-26 21:18+0100\n" +"POT-Creation-Date: 2025-11-01 15:58+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -10954,6 +10954,14 @@ msgstr "" msgid "%s%s: error when allocating new server" msgstr "" +#, c-format +msgid "%s%s: warning: unable to set option \"%s\" for server \"%s\"" +msgstr "" + +#, c-format +msgid "%s%s: warning: unknown option \"%s\" for server \"%s\"" +msgstr "" + #, c-format msgid "" "%s%s: sending data to server: null pointer (please report problem to " diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index e06325fa3..3fd00b040 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -2133,40 +2133,56 @@ irc_server_apply_command_line_options (struct t_irc_server *server, for (i = 0; i < argc; i++) { - if (argv[i][0] == '-') + if (argv[i][0] != '-') + continue; + + pos = strchr (argv[i], '='); + if (pos) { - pos = strchr (argv[i], '='); - if (pos) + option_name = weechat_strndup (argv[i] + 1, pos - argv[i] - 1); + ptr_value = pos + 1; + } + else + { + option_name = strdup (argv[i] + 1); + ptr_value = value_boolean[1]; + } + if (option_name) + { + index_option = irc_server_search_option (option_name); + if (index_option < 0) { - option_name = weechat_strndup (argv[i] + 1, pos - argv[i] - 1); - ptr_value = pos + 1; + /* look if option is negative, like "-noxxx" */ + if (weechat_strncmp (argv[i], "-no", 3) == 0) + { + free (option_name); + option_name = strdup (argv[i] + 3); + index_option = irc_server_search_option (option_name); + ptr_value = value_boolean[0]; + } + } + if (index_option >= 0) + { + if (weechat_config_option_set ( + server->options[index_option], + ptr_value, 1) == WEECHAT_CONFIG_OPTION_SET_ERROR) + { + weechat_printf ( + NULL, + _("%s%s: warning: unable to set option \"%s\" for server \"%s\""), + weechat_prefix ("error"), IRC_PLUGIN_NAME, + argv[i], server->name); + } } else { - option_name = strdup (argv[i] + 1); - ptr_value = value_boolean[1]; - } - if (option_name) - { - index_option = irc_server_search_option (option_name); - if (index_option < 0) - { - /* look if option is negative, like "-noxxx" */ - if (weechat_strncmp (argv[i], "-no", 3) == 0) - { - free (option_name); - option_name = strdup (argv[i] + 3); - index_option = irc_server_search_option (option_name); - ptr_value = value_boolean[0]; - } - } - if (index_option >= 0) - { - weechat_config_option_set (server->options[index_option], - ptr_value, 1); - } - free (option_name); + weechat_printf ( + NULL, + _("%s%s: warning: unknown option \"%s\" for server \"%s\""), + weechat_prefix ("error"), IRC_PLUGIN_NAME, + argv[i], server->name); } + free (option_name); } } }