merge: sync upstream profanity-im/profanity

Sync with upstream profanity-im/profanity.

Major upstream changes incorporated:

Memory management
  - Replace malloc+memset with g_new0 throughout codebase
  - Adopt auto_gchar / auto_gcharv / auto_gerror / auto_jid cleanup macros
  - Replace free() with g_free() for GAlloc'd memory

Editor rewrite
  - Remove pthread-based async editor; use GChildWatch callback API
  - New launch_editor(initial_content, callback, user_data) interface
  - Proper signal handling (SIGINT, SIGTSTP, SIGPIPE reset in child)
  - ui_suspend()/ui_resume() integration for TTY management

OMEMO improvements
  - Dual backend support: libsignal-protocol-c and libomemo-c
  - Proper pre-key removal after use (XEP-0384 compliance)
  - Automatic pre-key regeneration when store drops below threshold
  - New functions: omemo_is_device_active(), omemo_is_jid_trusted()
  - omemo_get_jid_untrusted_fingerprints() for better error messages
  - Fingerprint notifications on new device identity discovery
  - Deterministic pre-key ID generation tracking max_pre_key_id
  - omemo_trust_changed() UI updates on trust state changes

JID validation
  - RFC 6122-compliant validation in jid_is_valid()
  - Character-level checks (RFC 6122 forbidden chars: & ' / : < > @)
  - Length limits: 1023 per component, 3071 total
  - New jid_is_valid_user_jid() for user vs. service JID distinction

Database
  - Schema migration v3: UNIQUE constraint on archive_id for deduplication
  - Triggers for corrected message tracking (replaces_db_id / replaced_by_db_id)
  - db_history_result_t return type, _truncate_datetime_suffix()

UI / console
  - win_warn_needed() / win_warn_sent() warning deduplication hash table
  - PAD_MIN_HEIGHT dynamic pad sizing with PAD_THRESHOLD auto-cleanup
  - Spellcheck integration in input field with Unicode word detection
  - cons_spellcheck_setting() for /settings ui output
  - /[command]? shortcut for command help

Account config
  - Account name sanitization for GKeyFile special chars ([ ] = # \n \r)
  - Replace popen() with g_spawn_sync() for eval_password
  - TLS policy: add "direct" option alongside legacy

Connection
  - Port validation with g_assert (0–65535)
  - SHA-256 certificate fingerprint support (XMPP_CERT_PUBKEY_FINGERPRINT_SHA256)
  - "direct" TLS policy alias for legacy SSL

Common utilities
  - str_xml_sanitize() for XML 1.0 illegal character removal
  - string_matches_one_of() with formatted error messages
  - valid_tls_policy_option() helper
  - prof_date_time_format_iso8601() utility
  - Improved strip_arg_quotes() with backslash unescaping
  - prof_occurrences() uses g_slist_prepend + reverse for performance

PGP / OX
  - Proper GPGME resource cleanup with goto-cleanup pattern
  - g_string_free(xmppuri) leak fix in _ox_key_lookup

CSV export
  - Use GString + g_file_set_contents instead of raw write() syscalls

Tests
  - Restructured into subdirectories: command/, config/, xmpp/, ui/, omemo/, otr/, pgp/
  - New test_cmd_ac.c for autocompleter unit tests
  - Updated stubs for new UI suspend/resume functions

License headers
  - Migrate to SPDX-3.0 identifiers (GPL-3.0-or-later WITH OpenSSL-exception)

────────────────────────────────────────────────────
cproof-specific preservations:

  - XEP-0308 LMC: replace_id ?: id logic in message/stanza/omemo
  - Force encryption: cmd_force_encryption, test_forced_encryption
  - CWE-134: format string protection (cons_show("%s", ...))
  - y_start_pos-based paging in window.c
  - db_history_result_t return type, _truncate_datetime_suffix()

Merge-time fixes:

  - common.c: format-security (-Werror) — cons_show(errmsg) → cons_show("%s", errmsg)
  - database.c: null-deref guard — !msg->timestamp → msg && !msg->timestamp
  - console.c: implicit size_t → int cast — (int)(maxlen + 1)
  - tlscerts.c: %d for size_t — %zu

Build system:
  - Kept autotools (Makefile.am, configure.ac); upstream uses Meson
  - Restored deleted files: bootstrap.sh, autogen.sh, ax_valgrind_check.m4, configure-debug
  - Updated Makefile.am test paths for subdirectory structure
  - Added test_cmd_ac, test_forced_encryption to test sources

Functional tests:
  - Use cproof version; upstream requires stbbr_for_xmlns from updated stabber
  - Not yet available in devs/stabber fork

Closes #64

Merge author: jabber.developer2
Commits authors:
 Michael Vetter <jubalh@iodoru.org>
& Steffen Jaeckel <s@jaeckel.eu>

src/tools/editor.c

@@ -2,47 +2,19 @@
  * editor.c
  * vim: expandtab:ts=4:sts=4:sw=4
  *
- * Copyright (C) 2022 - 2025 Michael Vetter <jubalh@iodoru.org>
+ * Copyright (C) 2022 - 2026 Michael Vetter <jubalh@iodoru.org>
  * Copyright (C) 2022 MarcoPolo PasTonMolo <marcopolopastonmolo@protonmail.com>
  * Copyright (C) 2022 Steffen Jaeckel <jaeckel-floss@eyet-services.de>
  *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give permission to
- * link the code of portions of this program with the OpenSSL library under
- * certain conditions as described in each individual source file, and
- * distribute linked combinations including the two.
- *
- * You must obey the GNU General Public License in all respects for all of the
- * code used other than OpenSSL. If you modify file(s) with this exception, you
- * may extend this exception to your version of the file(s), but you are not
- * obligated to do so. If you do not wish to do so, delete this exception
- * statement from your version. If you delete this exception statement from all
- * source files in the program, then also delete it here.
- *
+ * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
  */
 
-#include <fcntl.h>
 #include <glib.h>
 #include <errno.h>
-#include <stdio.h> // necessary for readline
-#include <readline/readline.h>
+#include <stdio.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <pthread.h>
+#include <signal.h>
 
 #include "config/files.h"
 #include "config/preferences.h"
@@ -53,194 +25,53 @@
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 
-EditorTask editor_task = { 0, FALSE, NULL, NULL, PTHREAD_MUTEX_INITIALIZER, 0, NULL, NULL };
-
-void*
-editor_thread(void* arg)
+typedef struct EditorContext
 {
-    EditorTask* task = (EditorTask*)arg;
-    auto_gcharv gchar** argv = g_strsplit(task->editor_cmd, " ", 0);
+    gchar* filename;
+    void (*callback)(gchar* content, void* user_data);
+    void* user_data;
+} EditorContext;
 
-    pid_t pid = fork();
-    if (pid == 0) {
-        execvp(argv[0], argv);
-        log_error("[Editor] Failed to exec %s", argv[0]);
-        _exit(EXIT_FAILURE);
-    }
-
-    pthread_mutex_lock(&task->mutex);
-    if (pid > 0) {
-        task->pid = pid;
-        int status;
-        // Unlock mutex to avoid deadlock on the main loop
-        pthread_mutex_unlock(&task->mutex);
-        waitpid(pid, &status, 0);
-        pthread_mutex_lock(&task->mutex);
-
-        gsize length;
-        if (!g_file_get_contents(task->filename, &task->result, &length, &task->error)) {
-            log_error("[Editor] could not read from %s: %s", task->filename,
-                      task->error ? task->error->message : "No GLib error given");
-            task->result = g_strdup(""); // Ensure valid result
-        } else {
-            g_strchomp(task->result);
-            if (remove(task->filename) != 0) {
-                log_error("[Editor] error during file deletion of %s", task->filename);
-            } else {
-                log_debug("[Editor] deleted file: %s", task->filename);
-            }
-        }
-        if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-            task->error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                                      "Editor process failed with status %d", WEXITSTATUS(status));
-        }
-    } else {
-        task->error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_FAILED, "Fork failed: %s", strerror(errno));
-        task->result = g_strdup(""); // Ensure valid result
-    }
-
-    task->active = FALSE;
-    pthread_mutex_unlock(&task->mutex);
-
-    return NULL;
-}
-
-// Returns true if an error occurred
-gboolean
-get_message_from_editor_async(gchar* message)
+static void
+_editor_exit_cb(GPid pid, gint status, gpointer data)
 {
-    // Check if editor is already running
-    pthread_mutex_lock(&editor_task.mutex);
-    if (editor_task.active) {
-        pthread_mutex_unlock(&editor_task.mutex);
-        log_error("[Editor] Editor already running");
-        return TRUE;
-    }
-    pthread_mutex_unlock(&editor_task.mutex);
+    EditorContext* ctx = data;
+    gchar* contents = NULL;
+    GError* error = NULL;
 
-    // Create temporary file
-    auto_gchar gchar* filename = NULL;
-    GError* glib_error = NULL;
-    const char* jid = connection_get_barejid();
-    if (jid) {
-        filename = files_file_in_account_data_path(DIR_EDITOR, jid, "compose.md");
-    } else {
-        log_debug("[Editor] could not get JID");
-        auto_gchar gchar* data_dir = files_get_data_path(DIR_EDITOR);
-        if (!create_dir(data_dir)) {
-            log_error("[Editor] could not create directory %s", data_dir);
-            return TRUE;
-        }
-        filename = g_strdup_printf("%s/compose.md", data_dir);
-    }
-    if (!filename) {
-        log_error("[Editor] something went wrong while creating compose file");
-        return TRUE;
-    }
-
-    // Write message to file
-    gsize messagelen = message ? strlen(message) : 0;
-    if (!g_file_set_contents(filename, message ? message : "", messagelen, &glib_error)) {
-        log_error("[Editor] could not write to %s: %s", filename,
-                  glib_error ? glib_error->message : "No GLib error given");
-        if (glib_error) {
-            g_error_free(glib_error);
-        }
-        return TRUE;
-    }
-
-    // Prepare editor command
-    auto_gchar gchar* editor = prefs_get_string(PREF_COMPOSE_EDITOR);
-    auto_gchar gchar* editor_with_filename = g_strdup_printf("%s %s", editor, filename);
-
-    // Suspend NCurses
-    def_prog_mode();
-    endwin();
-
-    // Initialize thread task
-    pthread_mutex_lock(&editor_task.mutex);
-    editor_task.active = TRUE;
-    editor_task.result = NULL;
-    editor_task.error = NULL;
-    g_free(editor_task.filename);
-    g_free(editor_task.editor_cmd);
-    editor_task.filename = g_strdup(filename);
-    editor_task.editor_cmd = g_strdup(editor_with_filename);
-    pthread_mutex_unlock(&editor_task.mutex);
-
-    // Set background mode
-    background_mode = TRUE;
-    log_debug("[Editor] Entering background mode");
-
-    // Start editor thread
-    if (pthread_create(&editor_task.thread, NULL, editor_thread, &editor_task) != 0) {
-        pthread_mutex_lock(&editor_task.mutex);
-        editor_task.active = FALSE;
-        editor_task.error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                                        "Failed to create editor thread: %s", strerror(errno));
-        g_free(editor_task.filename);
-        g_free(editor_task.editor_cmd);
-        editor_task.filename = NULL;
-        editor_task.editor_cmd = NULL;
-        pthread_mutex_unlock(&editor_task.mutex);
-        background_mode = FALSE;
-        log_debug("[Editor] Exiting background mode");
-        reset_prog_mode();
-        doupdate();
-        log_error("[Editor] Failed to create editor thread");
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-void
-editor_process(ProfWin* window)
-{
-    pthread_mutex_lock(&editor_task.mutex);
-    if (editor_task.active) {
-        pthread_mutex_unlock(&editor_task.mutex);
-        return;
-    }
-    if (!editor_task.result) {
-        pthread_mutex_unlock(&editor_task.mutex);
-        return;
-    }
-
-    g_strchomp(editor_task.result);
-    rl_replace_line(editor_task.result, 0);
-    rl_point = rl_end;
-    rl_forced_update_display();
-    reset_prog_mode();
-    doupdate();
+    ui_resume();
     ui_resize();
-    g_free(editor_task.result);
-    g_free(editor_task.filename);
-    g_free(editor_task.editor_cmd);
-    editor_task.result = NULL;
-    editor_task.filename = NULL;
-    editor_task.editor_cmd = NULL;
-    if (editor_task.error) {
-        log_error("[Editor] %s", editor_task.error->message);
-        g_error_free(editor_task.error);
-        editor_task.error = NULL;
+
+    if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
+        if (g_file_get_contents(ctx->filename, &contents, NULL, &error)) {
+            g_strchomp(contents);
+            ctx->callback(contents, ctx->user_data);
+            g_free(contents);
+        } else {
+            log_error("[Editor] could not read from %s: %s", ctx->filename, error->message);
+            cons_show_error("Could not read edited content: %s", error->message);
+            g_error_free(error);
+        }
+    } else {
+        cons_show_error("Editor exited with error status %d", WEXITSTATUS(status));
     }
-    pthread_mutex_unlock(&editor_task.mutex);
-    background_mode = FALSE;
-    log_debug("[Editor] Exiting background mode");
+
+    if (remove(ctx->filename) != 0) {
+        log_error("[Editor] error during file deletion of %s", ctx->filename);
+    }
+
+    g_free(ctx->filename);
+    g_free(ctx);
+    g_spawn_close_pid(pid);
 }
 
-// Deprecated synchronous editor call. Returns a message as returned_message.
-// Please avoid using it, since it blocks execution of the message handling and other important functionality until the editor is closed.
-// Returns true if an error occurred
+// Returns a message via callback once the editor is closed.
+// Returns true if an error occurred.
 gboolean
-get_message_from_editor(gchar* message, gchar** returned_message)
+launch_editor(gchar* initial_content, void (*callback)(gchar* content, void* data), void* user_data)
 {
-    /* Make sure that there's no junk in the return-pointer in error cases */
-    *returned_message = NULL;
-
     auto_gchar gchar* filename = NULL;
-    GError* glib_error = NULL;
+    auto_gerror GError* glib_error = NULL;
     const char* jid = connection_get_barejid();
     if (jid) {
         filename = files_file_in_account_data_path(DIR_EDITOR, jid, "compose.md");
@@ -248,64 +79,79 @@ get_message_from_editor(gchar* message, gchar** returned_message)
         log_debug("[Editor] could not get JID");
         auto_gchar gchar* data_dir = files_get_data_path(DIR_EDITOR);
         if (!create_dir(data_dir)) {
+            cons_show_error("Could not create editor directory.");
             return TRUE;
         }
         filename = g_strdup_printf("%s/compose.md", data_dir);
     }
     if (!filename) {
         log_error("[Editor] something went wrong while creating compose file");
+        cons_show_error("Could not create compose file.");
         return TRUE;
     }
 
     gsize messagelen = 0;
-    if (message != NULL) {
-        messagelen = strlen(message);
+    if (initial_content != NULL) {
+        messagelen = strlen(initial_content);
     }
 
-    if (!g_file_set_contents(filename, message, messagelen, &glib_error)) {
-        log_error("[Editor] could not write to %s: %s", filename, glib_error ? glib_error->message : "No GLib error given");
-        if (glib_error) {
-            g_error_free(glib_error);
-        }
+    if (!g_file_set_contents(filename, initial_content, messagelen, &glib_error)) {
+        log_error("[Editor] could not write to %s: %s", filename, PROF_GERROR_MESSAGE(glib_error));
+        cons_show_error("Could not write to compose file: %s", PROF_GERROR_MESSAGE(glib_error));
         return TRUE;
     }
 
     auto_gchar gchar* editor = prefs_get_string(PREF_COMPOSE_EDITOR);
-    auto_gchar gchar* editor_with_filename = g_strdup_printf("%s %s", editor, filename);
-    auto_gcharv gchar** editor_argv = g_strsplit(editor_with_filename, " ", 0);
+    gchar** editor_argv = NULL;
+    GError* error = NULL;
 
-    // Fork / exec
-    pid_t pid = fork();
-    if (pid == 0) {
-        int x = execvp(editor_argv[0], editor_argv);
-        if (x == -1) {
-            log_error("[Editor] Failed to exec %s", editor);
-        }
-        _exit(EXIT_FAILURE);
-    } else {
-        if (pid == -1) {
-            return TRUE;
-        }
-        waitpid(pid, NULL, 0);
-
-        gchar* contents;
-        gsize length;
-        if (!g_file_get_contents(filename, &contents, &length, &glib_error)) {
-            log_error("[Editor] could not read from %s: %s", filename, glib_error ? glib_error->message : "No GLib error given");
-            if (glib_error) {
-                g_error_free(glib_error);
-            }
-            return TRUE;
-        }
-        /* Remove all trailing new-line characters */
-        g_strchomp(contents);
-        *returned_message = contents;
-        if (remove(filename) != 0) {
-            log_error("[Editor] error during file deletion of %s", filename);
-        } else {
-            log_debug("[Editor] deleted file: %s", filename);
-        }
+    auto_gchar gchar* full_cmd = g_strdup_printf("%s %s", editor, filename);
+    if (!g_shell_parse_argv(full_cmd, NULL, &editor_argv, &error)) {
+        log_error("[Editor] Failed to parse editor command: %s", error->message);
+        cons_show_error("Failed to parse editor command: %s", error->message);
+        g_error_free(error);
+        return TRUE;
     }
 
+    EditorContext* ctx = g_new0(EditorContext, 1);
+    ctx->filename = g_steal_pointer(&filename);
+    ctx->callback = callback;
+    ctx->user_data = user_data;
+
+    ui_suspend();
+
+    // Force GLib to install its SIGCHLD handler before forking. Creating a
+    // GChildWatchSource for our own pid is the documented trigger; we never
+    // attach or dispatch it, just rely on the side effect.
+    GSource* sigchld_warmup = g_child_watch_source_new(getpid());
+    g_source_unref(sigchld_warmup);
+
+    pid_t pid = fork();
+    if (pid == -1) {
+        log_error("[Editor] Failed to fork: %s", strerror(errno));
+        ui_resume();
+        ui_resize();
+        cons_show_error("Failed to start editor: %s", strerror(errno));
+        g_strfreev(editor_argv);
+        g_free(ctx->filename);
+        g_free(ctx);
+        return TRUE;
+    } else if (pid == 0) {
+        // Child process: Inherits TTY from parent
+
+        // Reset signal handlers that profanity sets so the editor doesn't inherit them
+        signal(SIGINT, SIG_DFL);
+        signal(SIGTSTP, SIG_DFL);
+        signal(SIGPIPE, SIG_DFL);
+
+        if (editor_argv && editor_argv[0]) {
+            execvp(editor_argv[0], editor_argv);
+        }
+        _exit(EXIT_FAILURE);
+    }
+
+    // Parent process: Watch the child asynchronously
+    g_child_watch_add((GPid)pid, _editor_exit_cb, ctx);
+    g_strfreev(editor_argv);
     return FALSE;
 }