Merge upstream/master into merge/upstream-full

Merge profanity-im/profanity master (373 commits) into cproof fork. Source changes (manual merge): - src/command/: cmd_defs, cmd_funcs, cmd_ac — upstream g_new0, auto_gchar, launch_editor callback; keep our XEP-0308 LMC, force-encryption, CWE-134 - src/config/: preferences, tlscerts, account — upstream UNIQUE dedup, dynamic pad capacity; keep our db_history_result_t, scroll logic - src/database.*: upstream g_new0 memory mgmt; keep our return types, add null-check fix for msg->timestamp - src/omemo/, src/pgp/: upstream _gpgme_key_get_email, g_new0; keep our replace_id in omemo_on_message_send - src/tools/: editor, http_upload, bookmark_ignore — upstream launch_editor callback API - src/ui/: console, window, chatwin, mucwin, inputwin, buffer — upstream win_warn_needed/sent dedup, PAD_MIN_HEIGHT dynamic pads; keep our y_start_pos scroll, _truncate_datetime_suffix - src/xmpp/: message, stanza, presence, roster_list, iq, session — upstream connection_get_available_resources; keep our LMC stanza logic - src/common.c: fix format-security (cons_show) Build system: - Makefile.am: updated test paths to subdirectory structure, added test_cmd_ac, test_forced_encryption - Restored autotools files deleted by upstream meson migration: bootstrap.sh, autogen.sh, m4/ax_valgrind_check.m4, configure-debug Tests: - Unit tests: upstream unittests.c base + our forced_encryption tests (482 passed, 0 failed across all 4 configurations) - Functional tests: kept our version (93 passed, 0 failed) upstream version requires stbbr_for_xmlns not yet in our stabber fork - Updated test stubs: stub_xmpp.c, stub_omemo.c from upstream Compile fixes: - src/common.c: cons_show(errmsg) -> cons_show("%s", errmsg) - src/database.c: null-check before msg->timestamp access - src/ui/console.c: size_t -> (int) cast for format width - src/config/tlscerts.c: %d -> %zu for size_t
2026-04-11 13:12:23 +03:00
parent f84ed1bf6a 1ac05754be
commit c6bc85ccd5
301 changed files with 10359 additions and 9361 deletions
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -3,35 +3,9 @@
 * vim: expandtab:ts=4:sts=4:sw=4
 *
 * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
- * Copyright (C) 2019 - 2025 Michael Vetter <jubalh@iodoru.org>
- *
- * 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.
+ * Copyright (C) 2019 - 2026 Michael Vetter <jubalh@iodoru.org>
 *
+ * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
 */

 #include "config.h"
@@ -69,6 +43,7 @@
 static char* _sub_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _notify_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _theme_autocomplete(ProfWin* window, const char* const input, gboolean previous);
+static char* _spellcheck_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _autoaway_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _autoconnect_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _account_autocomplete(ProfWin* window, const char* const input, gboolean previous);
@@ -134,6 +109,7 @@ static char* _lastactivity_autocomplete(ProfWin* window, const char* const input
 static char* _intype_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _mood_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _strophe_autocomplete(ProfWin* window, const char* const input, gboolean previous);
+static char* _stamp_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _adhoc_cmd_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _vcard_autocomplete(ProfWin* window, const char* const input, gboolean previous);
 static char* _force_encryption_autocomplete(ProfWin* window, const char* const input, gboolean previous);
@@ -164,6 +140,7 @@ static Autocomplete autoconnect_ac;
 static Autocomplete wintitle_ac;
 static Autocomplete theme_ac;
 static Autocomplete theme_load_ac;
+static Autocomplete spellcheck_ac;
 static Autocomplete account_ac;
 static Autocomplete account_set_ac;
 static Autocomplete account_clear_ac;
@@ -287,6 +264,8 @@ static Autocomplete mood_type_ac;
 static Autocomplete strophe_ac;
 static Autocomplete strophe_sm_ac;
 static Autocomplete strophe_verbosity_ac;
+static Autocomplete stamp_ac;
+static Autocomplete stamp_unset_ac;
 static Autocomplete adhoc_cmd_ac;
 static Autocomplete lastactivity_ac;
 static Autocomplete vcard_ac;
@@ -300,6 +279,8 @@ static Autocomplete vcard_address_type_ac;
 static Autocomplete force_encryption_ac;
 static Autocomplete force_encryption_policy_ac;

+static char* last_filepath_input = NULL;
+
 static Autocomplete* all_acs[] = {
    &commands_ac,
    &who_room_ac,
@@ -322,6 +303,7 @@ static Autocomplete* all_acs[] = {
    &autoconnect_ac,
    &wintitle_ac,
    &theme_ac,
+    &spellcheck_ac,
    &account_ac,
    &account_set_ac,
    &account_clear_ac,
@@ -441,6 +423,8 @@ static Autocomplete* all_acs[] = {
    &strophe_ac,
    &strophe_sm_ac,
    &strophe_verbosity_ac,
+    &stamp_ac,
+    &stamp_unset_ac,
    &adhoc_cmd_ac,
    &lastactivity_ac,
    &vcard_ac,
@@ -587,6 +571,11 @@ cmd_ac_init(void)
    autocomplete_add(theme_ac, "colours");
    autocomplete_add(theme_ac, "properties");

+    autocomplete_add(spellcheck_ac, "on");
+    autocomplete_add(spellcheck_ac, "off");
+    autocomplete_add(spellcheck_ac, "list");
+    autocomplete_add(spellcheck_ac, "lang");
+
    autocomplete_add(disco_ac, "info");
    autocomplete_add(disco_ac, "items");

@@ -858,8 +847,9 @@ cmd_ac_init(void)
    autocomplete_add(tls_property_ac, "force");
    autocomplete_add(tls_property_ac, "allow");
    autocomplete_add(tls_property_ac, "trust");
-    autocomplete_add(tls_property_ac, "legacy");
+    autocomplete_add(tls_property_ac, "direct");
    autocomplete_add(tls_property_ac, "disable");
+    autocomplete_add(tls_property_ac, "legacy");

    autocomplete_add(auth_property_ac, "default");
    autocomplete_add(auth_property_ac, "legacy");
@@ -1185,6 +1175,13 @@ cmd_ac_init(void)
    autocomplete_add(strophe_verbosity_ac, "2");
    autocomplete_add(strophe_verbosity_ac, "3");

+    autocomplete_add(stamp_ac, "outgoing");
+    autocomplete_add(stamp_ac, "incoming");
+    autocomplete_add(stamp_ac, "unset");
+
+    autocomplete_add(stamp_unset_ac, "outgoing");
+    autocomplete_add(stamp_unset_ac, "incoming");
+
    autocomplete_add(mood_ac, "set");
    autocomplete_add(mood_ac, "clear");
    autocomplete_add(mood_ac, "on");
@@ -1414,6 +1411,7 @@ cmd_ac_init(void)
    g_hash_table_insert(ac_funcs, "/status", _status_autocomplete);
    g_hash_table_insert(ac_funcs, "/statusbar", _statusbar_autocomplete);
    g_hash_table_insert(ac_funcs, "/strophe", _strophe_autocomplete);
+    g_hash_table_insert(ac_funcs, "/stamp", _stamp_autocomplete);
    g_hash_table_insert(ac_funcs, "/sub", _sub_autocomplete);
    g_hash_table_insert(ac_funcs, "/subject", _subject_autocomplete);
    g_hash_table_insert(ac_funcs, "/theme", _theme_autocomplete);
@@ -1557,6 +1555,10 @@ cmd_ac_remove_form_fields(DataForm* form)
 char*
 cmd_ac_complete(ProfWin* window, const char* const input, gboolean previous)
 {
+    if (!input) {
+        return NULL;
+    }
+
    char* found = NULL;
    // autocomplete command
    if ((strncmp(input, "/", 1) == 0) && (!strchr(input, ' '))) {
@@ -1660,65 +1662,74 @@ cmd_ac_uninit(void)
    autocomplete_free(plugins_unload_ac);
    autocomplete_free(plugins_reload_ac);
    autocomplete_free(script_show_ac);
+    g_free(last_filepath_input);
+    last_filepath_input = NULL;
    g_hash_table_destroy(ac_funcs);
    ac_funcs = NULL;
 }

 static void
-_filepath_item_free(char** ptr)
+_filepath_item_free(gchar** ptr)
 {
-    char* item = *ptr;
-    free(item);
+    gchar* item = *ptr;
+    g_free(item);
 }

 char*
 cmd_ac_complete_filepath(const char* const input, char* const startstr, gboolean previous)
 {
-    unsigned int output_off = 0;
-    char* tmp = NULL;
-
    // strip command
-    char* inpcp = (char*)input + strlen(startstr);
-    while (*inpcp == ' ') {
-        inpcp++;
+    char* inpcp_ptr = (char*)input + strlen(startstr);
+    while (*inpcp_ptr == ' ') {
+        inpcp_ptr++;
    }

-    inpcp = strdup(inpcp);
-
-    // strip quotes
-    if (*inpcp == '"') {
-        tmp = strrchr(inpcp + 1, '"');
-        if (tmp) {
-            *tmp = '\0';
-        }
-        tmp = strdup(inpcp + 1);
-        free(inpcp);
-        inpcp = tmp;
-        tmp = NULL;
-    }
-
-    // expand ~ to $HOME
-    if (inpcp[0] == '~' && inpcp[1] == '/') {
-        char* home = getenv("HOME");
-        if (!home) {
-            free(inpcp);
-            return NULL;
-        }
-        tmp = g_strdup_printf("%s/%sfoo", home, inpcp + 2);
-        output_off = strlen(home) + 1;
-    } else {
-        tmp = g_strdup_printf("%sfoo", inpcp);
-    }
-    free(inpcp);
-    if (!tmp) {
+    auto_gchar gchar* inpcp = g_strdup(inpcp_ptr);
+    if (!inpcp) {
        return NULL;
    }

-    char* foofile = strdup(basename(tmp));
-    char* directory = strdup(dirname(tmp));
-    g_free(tmp);
+    // strip quotes
+    if (inpcp[0] == '"') {
+        char* last_quote = strrchr(inpcp + 1, '"');
+        if (last_quote) {
+            *last_quote = '\0';
+        }
+        gchar* unquoted = g_strdup(inpcp + 1);
+        g_free(inpcp);
+        inpcp = unquoted;
+    }

-    GArray* files = g_array_new(TRUE, FALSE, sizeof(char*));
+    auto_gchar gchar* expanded = get_expanded_path(inpcp);
+    if (!expanded) {
+        return NULL;
+    }
+
+    auto_gchar gchar* foofile = g_path_get_basename(expanded);
+    auto_gchar gchar* directory = g_path_get_dirname(expanded);
+
+    // If the input is already a known completion, don't update to allow cycling
+    if (last_filepath_input && (g_strcmp0(inpcp, last_filepath_input) == 0 || autocomplete_contains(filepath_ac, inpcp))) {
+        return autocomplete_param_with_ac(input, startstr, filepath_ac, TRUE, previous);
+    }
+
+    // If the input ends with a slash, the basename will be "." or "/"
+    // In that case, we are looking for all files in that directory
+    gboolean find_all = FALSE;
+    size_t inpcp_len = strlen(inpcp);
+    if (inpcp_len == 0 || inpcp[inpcp_len - 1] == '/') {
+        find_all = TRUE;
+    }
+
+    char* last_slash = strrchr(inpcp, '/');
+    auto_gchar gchar* user_dir_part = NULL;
+    if (last_slash) {
+        user_dir_part = g_strndup(inpcp, last_slash - inpcp + 1);
+    } else {
+        user_dir_part = g_strdup("");
+    }
+
+    GArray* files = g_array_new(TRUE, FALSE, sizeof(gchar*));
    g_array_set_clear_func(files, (GDestroyNotify)_filepath_item_free);

    DIR* d = opendir(directory);
@@ -1726,47 +1737,48 @@ cmd_ac_complete_filepath(const char* const input, char* const startstr, gboolean
        struct dirent* dir;

        while ((dir = readdir(d)) != NULL) {
-            if (strcmp(dir->d_name, ".") == 0) {
-                continue;
-            } else if (strcmp(dir->d_name, "..") == 0) {
-                continue;
-            } else if (*(dir->d_name) == '.' && *foofile != '.') {
-                // only show hidden files on explicit request
+            if (strcmp(dir->d_name, ".") == 0 || strcmp(dir->d_name, "..") == 0) {
                continue;
            }

-            char* acstring = NULL;
-            if (output_off) {
-                tmp = g_strdup_printf("%s/%s", directory, dir->d_name);
-                if (tmp) {
-                    acstring = g_strdup_printf("~/%s", tmp + output_off);
-                    g_free(tmp);
-                }
-            } else if (strcmp(directory, "/") == 0) {
-                acstring = g_strdup_printf("/%s", dir->d_name);
-            } else {
-                acstring = g_strdup_printf("%s/%s", directory, dir->d_name);
-            }
-            if (!acstring) {
-                g_array_free(files, TRUE);
-                free(foofile);
-                free(directory);
-                return NULL;
+            // check if it matches prefix
+            if (!find_all && !g_str_has_prefix(dir->d_name, foofile)) {
+                continue;
            }

-            g_array_append_val(files, acstring);
+            // only show hidden files on explicit request
+            if (dir->d_name[0] == '.' && (find_all || foofile[0] != '.')) {
+                continue;
+            }
+
+            gchar* acstring = g_strdup_printf("%s%s", user_dir_part, dir->d_name);
+
+            if (acstring) {
+                g_array_append_val(files, acstring);
+            }
        }
        closedir(d);
    }
-    free(directory);
-    free(foofile);

    autocomplete_update(filepath_ac, (char**)files->data);
    g_array_free(files, TRUE);

+    g_free(last_filepath_input);
+    last_filepath_input = g_strdup(inpcp);
+
    return autocomplete_param_with_ac(input, startstr, filepath_ac, TRUE, previous);
 }

+static char*
+_spellcheck_autocomplete(ProfWin* window, const char* const input, gboolean previous)
+{
+    char* result = NULL;
+
+    result = autocomplete_param_with_ac(input, "/spellcheck", spellcheck_ac, TRUE, previous);
+
+    return result;
+}
+
 static char*
 _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previous)
 {
@@ -1779,13 +1791,18 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
                                 "/history", "/vercheck", "/privileges", "/wrap",
                                 "/carbons", "/slashguard", "/mam", "/silence" };

-    for (int i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
        result = autocomplete_param_with_func(input, boolean_choices[i], prefs_autocomplete_boolean_choice, previous, NULL);
        if (result) {
            return result;
        }
    }

+    result = _spellcheck_autocomplete(window, input, previous);
+    if (result) {
+        return result;
+    }
+
    // autocomplete nickname in chat rooms
    if (window->type == WIN_MUC) {
        ProfMucWin* mucwin = (ProfMucWin*)window;
@@ -1796,7 +1813,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ

            // Remove quote character before and after names when doing autocomplete
            char* unquoted = strip_arg_quotes(input);
-            for (int i = 0; i < ARRAY_SIZE(nick_choices); i++) {
+            for (size_t i = 0; i < ARRAY_SIZE(nick_choices); i++) {
                result = autocomplete_param_with_ac(unquoted, nick_choices[i], nick_ac, TRUE, previous);
                if (result) {
                    free(unquoted);
@@ -1811,7 +1828,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
        gchar* contact_choices[] = { "/msg", "/info" };
        // Remove quote character before and after names when doing autocomplete
        char* unquoted = strip_arg_quotes(input);
-        for (int i = 0; i < ARRAY_SIZE(contact_choices); i++) {
+        for (size_t i = 0; i < ARRAY_SIZE(contact_choices); i++) {
            result = autocomplete_param_with_func(unquoted, contact_choices[i], roster_contact_autocomplete, previous, NULL);
            if (result) {
                free(unquoted);
@@ -1826,7 +1843,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
        free(unquoted);

        gchar* resource_choices[] = { "/caps", "/ping" };
-        for (int i = 0; i < ARRAY_SIZE(resource_choices); i++) {
+        for (size_t i = 0; i < ARRAY_SIZE(resource_choices); i++) {
            result = autocomplete_param_with_func(input, resource_choices[i], roster_fulljid_autocomplete, previous, NULL);
            if (result) {
                return result;
@@ -1835,7 +1852,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
    }

    gchar* invite_choices[] = { "/join" };
-    for (int i = 0; i < ARRAY_SIZE(invite_choices); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(invite_choices); i++) {
        result = autocomplete_param_with_func(input, invite_choices[i], muc_invites_find, previous, NULL);
        if (result) {
            return result;
@@ -1855,7 +1872,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
        { "/inputwin", winpos_ac },
    };

-    for (int i = 0; i < ARRAY_SIZE(ac_cmds); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(ac_cmds); i++) {
        result = autocomplete_param_with_ac(input, ac_cmds[i].cmd, ac_cmds[i].completer, TRUE, previous);
        if (result) {
            return result;
@@ -1875,7 +1892,8 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
    }
    parsed[i] = '\0';

-    char* (*ac_func)(ProfWin*, const char* const, gboolean) = g_hash_table_lookup(ac_funcs, parsed);
+    char* (*ac_func)(ProfWin*, const char* const, gboolean) = (char* (*)(ProfWin*, const char* const, gboolean))g_hash_table_lookup(ac_funcs, parsed);
+
    if (ac_func) {
        result = ac_func(window, input, previous);
        if (result) {
@@ -1944,7 +1962,7 @@ _who_autocomplete(ProfWin* window, const char* const input, gboolean previous)
                                        "/who chat", "/who away", "/who xa", "/who dnd", "/who available",
                                        "/who unavailable" };

-            for (int i = 0; i < ARRAY_SIZE(group_commands); i++) {
+            for (size_t i = 0; i < ARRAY_SIZE(group_commands); i++) {
                result = autocomplete_param_with_func(input, group_commands[i], roster_group_autocomplete, previous, NULL);
                if (result) {
                    return result;
@@ -2266,7 +2284,7 @@ _notify_autocomplete(ProfWin* window, const char* const input, gboolean previous

    gchar* boolean_choices1[] = { "/notify room current", "/notify chat current", "/notify typing current",
                                  "/notify room text", "/notify chat text", "/notify room offline" };
-    for (int i = 0; i < ARRAY_SIZE(boolean_choices1); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(boolean_choices1); i++) {
        result = autocomplete_param_with_func(input, boolean_choices1[i], prefs_autocomplete_boolean_choice, previous, NULL);
        if (result) {
            return result;
@@ -2299,7 +2317,7 @@ _notify_autocomplete(ProfWin* window, const char* const input, gboolean previous
    }

    gchar* boolean_choices2[] = { "/notify invite", "/notify sub", "/notify mention", "/notify trigger" };
-    for (int i = 0; i < ARRAY_SIZE(boolean_choices2); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(boolean_choices2); i++) {
        result = autocomplete_param_with_func(input, boolean_choices2[i], prefs_autocomplete_boolean_choice, previous, NULL);
        if (result) {
            return result;
@@ -3745,7 +3763,7 @@ _account_autocomplete(ProfWin* window, const char* const input, gboolean previou
                                "/account disable", "/account rename", "/account clear", "/account remove",
                                "/account default set" };

-    for (int i = 0; i < ARRAY_SIZE(account_choice); i++) {
+    for (size_t i = 0; i < ARRAY_SIZE(account_choice); i++) {
        found = autocomplete_param_with_func(input, account_choice[i], accounts_find_all, previous, NULL);
        if (found) {
            return found;
@@ -4262,6 +4280,20 @@ _strophe_autocomplete(ProfWin* window, const char* const input, gboolean previou
    return autocomplete_param_with_ac(input, "/strophe", strophe_ac, FALSE, previous);
 }

+static char*
+_stamp_autocomplete(ProfWin* window, const char* const input, gboolean previous)
+{
+    char* result = NULL;
+
+    result = autocomplete_param_with_ac(input, "/stamp unset", stamp_unset_ac, TRUE, previous);
+    if (result) {
+        return result;
+    }
+
+    result = autocomplete_param_with_ac(input, "/stamp", stamp_ac, TRUE, previous);
+    return result;
+}
+
 static char*
 _adhoc_cmd_autocomplete(ProfWin* window, const char* const input, gboolean previous)
 {
@@ -4286,7 +4318,7 @@ _vcard_autocomplete(ProfWin* window, const char* const input, gboolean previous)
        gboolean is_num = TRUE;

        if (num_args >= 2) {
-            for (int i = 0; i < strlen(args[1]); i++) {
+            for (size_t i = 0; i < strlen(args[1]); i++) {
                if (!isdigit((int)args[1][i])) {
                    is_num = FALSE;
                    break;