api: return input string in function string_iconv_from_internal when current locale is wrong

This fixes a bug when writing configuration files with a wrong locale: now
UTF-8 is kept and written in files instead of string converted using a wrong
charset.

CHANGELOG.md

@@ -1,5 +1,17 @@
 # WeeChat ChangeLog
 
+## Version 4.5.3 (under dev)
+
+### Fixed
+
+- core: save configuration files as UTF-8 when the locale is wrong
+
+## Version 4.5.2 (2025-02-20)
+
+### Fixed
+
+- core: fix build with gcc 15 ([#2229](https://github.com/weechat/weechat/issues/2229), [#2230](https://github.com/weechat/weechat/issues/2230))
+
 ## Version 4.5.1 (2024-12-23)
 
 ### Fixed

debian-stable/changelog

@@ -1,3 +1,10 @@
+weechat (4.5.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update copyright file (new year)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 20 Jan 2025 14:39:42 +0000
+
 weechat (4.4.3-1) unstable; urgency=medium
 
   * New upstream release

doc/en/weechat_relay_api.en.adoc

@@ -1184,7 +1184,7 @@ Body parameters:
 
 * `buffer_id` (integer, optional): buffer unique identifier (not to be confused
   with the buffer number, which is different)
-* `buffer` (string, optional, default: `core.weechat`): buffer name
+* `buffer_name` (string, optional, default: `core.weechat`): buffer name
 * `command` (string, **required**): command or text to send to the buffer
 
 Request example: say "hello!" on channel #weechat:
@@ -1192,7 +1192,7 @@ Request example: say "hello!" on channel #weechat:
 [source,shell]
 ----
 curl -L -u 'plain:secret_password' -X POST \
-  -d '{"buffer": "irc.libera.#weechat", "command": "hello!"}' \
+  -d '{"buffer_name": "irc.libera.#weechat", "command": "hello!"}' \
   'https://localhost:9000/api/input'
 ----
 

doc/fr/weechat_relay_api.fr.adoc

@@ -1196,7 +1196,7 @@ Paramètres du corps :
 
 * `buffer_id` (entier, facultatif) : identifiant unique du tampon (à ne pas
   confondre avec le numéro du tampon, qui est différent)
-* `buffer_name` (chaîne, facultatif) : nom de tampon
+* `buffer_name` (chaîne, facultatif, par défaut : `core.weechat`) : nom de tampon
 * `command` (chaîne, **obligatoire**) : commande ou texte à envoyer au tampon
 
 Exemple de requête : dire "hello!" sur le canal #weechat :
@@ -1204,7 +1204,7 @@ Exemple de requête : dire "hello!" sur le canal #weechat :
 [source,shell]
 ----
 curl -L -u 'plain:secret_password' -X POST \
-  -d '{"buffer": "irc.libera.#weechat", "command": "hello!"}' \
+  -d '{"buffer_name": "irc.libera.#weechat", "command": "hello!"}' \
   'https://localhost:9000/api/input'
 ----
 

src/core/core-debug.c

@@ -228,8 +228,11 @@ debug_dump_cb (const void *pointer, void *data,
  */
 
 void
-debug_sigsegv_cb ()
+debug_sigsegv_cb (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     debug_dump (1);
     unhook_all ();
     gui_main_end (0);

src/core/core-debug.h

@@ -27,7 +27,7 @@ struct t_gui_window_tree;
 extern long long debug_long_callbacks;
 
 extern void debug_build_info ();
-extern void debug_sigsegv_cb ();
+extern void debug_sigsegv_cb (int signo);
 extern void debug_windows_tree ();
 extern void debug_memory ();
 extern void debug_hdata ();

src/core/core-signal.c

@@ -65,8 +65,11 @@ volatile sig_atomic_t signal_sigusr2_count = 0;
  */
 
 void
-signal_sighup_cb ()
+signal_sighup_cb (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     signal_sighup_count++;
 }
 
@@ -75,8 +78,11 @@ signal_sighup_cb ()
  */
 
 void
-signal_sigquit_cb ()
+signal_sigquit_cb (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     signal_sigquit_count++;
 }
 
@@ -85,8 +91,11 @@ signal_sigquit_cb ()
  */
 
 void
-signal_sigterm_cb ()
+signal_sigterm_cb (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     signal_sigterm_count++;
 }
 
@@ -95,8 +104,11 @@ signal_sigterm_cb ()
  */
 
 void
-signal_sigusr1_cb ()
+signal_sigusr1_cb (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     signal_sigusr1_count++;
 }
 
@@ -105,8 +117,11 @@ signal_sigusr1_cb ()
  */
 
 void
-signal_sigusr2_cb ()
+signal_sigusr2_cb (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     signal_sigusr2_count++;
 }
 

src/core/core-string.c

@@ -3253,7 +3253,8 @@ string_iconv_to_internal (const char *charset, const char *string)
 }
 
 /*
- * Converts internal string to terminal charset, for display.
+ * Converts internal string to terminal charset, for display or write of
+ * configuration files.
  *
  * Note: result must be freed after use.
  */
@@ -3270,6 +3271,10 @@ string_iconv_from_internal (const char *charset, const char *string)
     if (!input)
         return NULL;
 
+    /* if the locale is wrong, we keep UTF-8 */
+    if (!weechat_locale_ok)
+        return input;
+
     /*
      * optimized for UTF-8: if charset is NULL => we use term charset => if
      * this charset is already UTF-8, then no iconv is needed

src/core/weechat.h

@@ -118,6 +118,7 @@ extern char *weechat_data_dir;
 extern char *weechat_state_dir;
 extern char *weechat_cache_dir;
 extern char *weechat_runtime_dir;
+extern int weechat_locale_ok;
 extern char *weechat_local_charset;
 extern int weechat_plugin_no_dlclose;
 extern int weechat_no_gnutls;

src/gui/curses/gui-curses-main.c

@@ -150,8 +150,11 @@ gui_main_get_password (const char **prompt, char *password, int size)
  */
 
 void
-gui_main_signal_sigint ()
+gui_main_signal_sigint (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     weechat_quit = 1;
 }
 
@@ -253,8 +256,11 @@ gui_main_init ()
  */
 
 void
-gui_main_signal_sigwinch ()
+gui_main_signal_sigwinch (int signo)
 {
+    /* make C compiler happy */
+    (void) signo;
+
     gui_signal_sigwinch_received = 1;
 }
 

src/gui/curses/headless/ncurses-fake.h

@@ -20,6 +20,7 @@
 #ifndef WEECHAT_NCURSES_FAKE_H
 #define WEECHAT_NCURSES_FAKE_H
 
+#include <stdbool.h>
 #include <stddef.h>
 
 #define ERR (-1)
@@ -71,7 +72,6 @@ struct _window
 };
 typedef struct _window WINDOW;
 
-typedef unsigned char bool;
 typedef int attr_t;
 typedef unsigned chtype;
 

src/plugins/relay/api/relay-api-protocol.c

@@ -994,7 +994,7 @@ error:
  * {
  *     "request": "POST /api/input",
  *     "body": {
- *         "buffer": "irc.libera.#weechat",
+ *         "buffer_name": "irc.libera.#weechat",
  *         "command": "hello!"
  *     }
  * }
@@ -1002,10 +1002,10 @@ error:
  * It is converted to an HTTP request which could have been:
  *
  * POST /api/input HTTP/1.1
- * Content-Length: 53
+ * Content-Length: 58
  * Content-Type: application/json
  *
- * {"buffer": "irc.libera.#weechat","command": "hello!"}
+ * {"buffer_name": "irc.libera.#weechat","command": "hello!"}
  *
  * The JSON can also be an array of requests, for example to fetch all buffers
  * data and synchronize at same time:

src/plugins/relay/api/weechat-relay-api.yaml

@@ -13,7 +13,7 @@ info:
   license:
     name: CC BY-NC-SA 4.0
     url: https://creativecommons.org/licenses/by-nc-sa/4.0/
-  version: 0.2.0
+  version: 0.3.0
 
 externalDocs:
   url: https://weechat.org/doc/
@@ -991,7 +991,7 @@ components:
                 format: int64
                 description: Buffer identifier (≥ 0)
                 example: 1709932823238637
-              buffer:
+              buffer_name:
                 type: string
                 description: >-
                   Buffer full name

version.sh

@@ -39,8 +39,8 @@
 #     devel-number   the devel version as hex number ("0x04010000" for "4.1.0-dev")
 #
 
-weechat_stable="4.5.1"
+weechat_stable="4.5.2"
-weechat_devel="4.5.1"
+weechat_devel="4.5.3-dev"
 
 stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)
 stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2)