Merge branch '4490_cleanup'

* 4490_cleanup: (31 commits) Update po/*.po files. ext.d/image.sh: use exiftool in addition to exif to view image metadata. ext.d/image.sh: check $DISPLAY in the xpm View action. mc.ext.ini: support avif images. mc.ext.ini: add View action for webp images. Update copyright years. (main): call tty_check_term() right after mc_args_parse(). Refactor learn keys. Use g_string_new_take(). (test_glob_prepare_replace_str): remove unneeded type cast. maint/utils/update-years.sh: replaced unportable 'sed -i' command. maint/utils/update-years.sh: add src/man2hlp/man2hlp.in. src/man2hlp/man2hlp.in: collapse copyright years. (str_utf8_offset_to_pos): change type of variable. (mc_search_regex__get_max_num_of_replace_tokens): refactor loop. lib/widget/input_complete.c: remove intermediate variables. mcedit: add intermediate variables to make code more readable and debuggable. (is_blank): refactor loop. (edit_help): use help node of editor dialog. (tree_execute_cmd): move CK_Help handler to separate function tree_help() ...
MidnightCommander · Jan 14, 2024 · e850db3 · e850db3
2 parents 6abea99 + 5e5593e
commit e850db3
Show file tree

Hide file tree

Showing 307 changed files with 1,101 additions and 897 deletions.
diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in
diff --git a/lib/charsets.c b/lib/charsets.c
@@ -1,7 +1,7 @@
 /*
    Text conversion from one charset to another.
 
-   Copyright (C) 2001-2023
+   Copyright (C) 2001-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/event/event.c b/lib/event/event.c
@@ -2,7 +2,7 @@
    Handle  events in application.
    Interface functions: init/deinit; start/stop
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/event/manage.c b/lib/event/manage.c
@@ -2,7 +2,7 @@
    Handle any events in application.
    Manage events: add, delete, destroy, search
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/event/raise.c b/lib/event/raise.c
@@ -2,7 +2,7 @@
    Handle any events in application.
    Raise events.
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/filehighlight/common.c b/lib/filehighlight/common.c
@@ -2,7 +2,7 @@
    File highlight plugin.
    Interface functions
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/filehighlight/get-color.c b/lib/filehighlight/get-color.c
@@ -2,7 +2,7 @@
    File highlight plugin.
    Interface functions. get color pair index for highlighted file.
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c
@@ -2,7 +2,7 @@
    File highlight plugin.
    Reading and parse rules from ini-files
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/glibcompat.c b/lib/glibcompat.c
@@ -1,7 +1,7 @@
 /*
    GLIB - Library of useful routines for C programming
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:
@@ -140,6 +140,41 @@ g_queue_clear_full (GQueue * queue, GDestroyNotify free_func)
 
 /* --------------------------------------------------------------------------------------------- */
 
+#if ! GLIB_CHECK_VERSION (2, 77, 0)
+/**
+ * g_string_new_take:
+ * @init: (nullable): initial text used as the string.
+ *     Ownership of the string is transferred to the #GString.
+ *     Passing NULL creates an empty string.
+ *
+ * Creates a new #GString, initialized with the given string.
+ *
+ * After this call, @init belongs to the #GString and may no longer be
+ * modified by the caller. The memory of @data has to be dynamically
+ * allocated and will eventually be freed with g_free().
+ *
+ * Returns: the new #GString
+ */
+GString *
+g_string_new_take (char *init)
+{
+    GString *string;
+
+    if (init == NULL)
+        return g_string_new (NULL);
+
+    string = g_slice_new (GString);
+
+    string->str = init;
+    string->len = strlen (string->str);
+    string->allocated_len = string->len + 1;
+
+    return string;
+}
+#endif /* ! GLIB_CHECK_VERSION (2, 77, 0) */
+
+/* --------------------------------------------------------------------------------------------- */
+
 /**
  * mc_g_string_copy:
  * @dest: (not nullable): the destination #GString. Its current contents are destroyed

diff --git a/lib/glibcompat.h b/lib/glibcompat.h
@@ -25,6 +25,10 @@ void g_clear_list (GList ** list_ptr, GDestroyNotify destroy);
 void g_queue_clear_full (GQueue * queue, GDestroyNotify free_func);
 #endif /* ! GLIB_CHECK_VERSION (2, 60, 0) */
 
+#if ! GLIB_CHECK_VERSION (2, 77, 0)
+GString *g_string_new_take (char *init);
+#endif /* ! GLIB_CHECK_VERSION (2, 77, 0) */
+
 /* There is no such API in GLib2 */
 GString *mc_g_string_copy (GString * dest, const GString * src);
 

diff --git a/lib/global.c b/lib/global.c
@@ -1,7 +1,7 @@
 /*
    Global structure for some library-related variables
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/hook.c b/lib/hook.c
@@ -4,7 +4,7 @@
    Slavaz: Warning! this file is deprecated and should be replaced
    by mcevents functional.
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/keybind.c b/lib/keybind.c
@@ -1,7 +1,7 @@
 /*
    Definitions of key bindings.
 
-   Copyright (C) 2005-2023
+   Copyright (C) 2005-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/lock.c b/lib/lock.c
@@ -1,7 +1,7 @@
 /*
    File locking
 
-   Copyright (C) 2003-2023
+   Copyright (C) 2003-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/logging.c b/lib/logging.c
@@ -1,7 +1,7 @@
 /*
    Provides a log file to ease tracing the program.
 
-   Copyright (C) 2006-2023
+   Copyright (C) 2006-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/mcconfig/common.c b/lib/mcconfig/common.c
@@ -1,7 +1,7 @@
 /*
    Configure module for the Midnight Commander
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    This file is part of the Midnight Commander.

diff --git a/lib/mcconfig/get.c b/lib/mcconfig/get.c
@@ -1,7 +1,7 @@
 /*
    Configure module for the Midnight Commander
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    This file is part of the Midnight Commander.

diff --git a/lib/mcconfig/history.c b/lib/mcconfig/history.c
@@ -1,7 +1,7 @@
 /*
    Configure module for the Midnight Commander
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Authors:

diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c
@@ -1,7 +1,7 @@
 /*
    paths to configuration files
 
-   Copyright (C) 2010-2023
+   Copyright (C) 2010-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/mcconfig/set.c b/lib/mcconfig/set.c
@@ -1,7 +1,7 @@
 /*
    Configure module for the Midnight Commander
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    This file is part of the Midnight Commander.

diff --git a/lib/search/glob.c b/lib/search/glob.c
@@ -2,7 +2,7 @@
    Search text engine.
    Glob-style pattern matching
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/search/hex.c b/lib/search/hex.c
@@ -2,7 +2,7 @@
    Search text engine.
    HEX-style pattern matching
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/search/lib.c b/lib/search/lib.c
@@ -2,7 +2,7 @@
    Search text engine.
    Common share code for module.
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/search/normal.c b/lib/search/normal.c
@@ -2,7 +2,7 @@
    Search text engine.
    Plain search
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/search/regex.c b/lib/search/regex.c
@@ -2,7 +2,7 @@
    Search text engine.
    Regex search
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:
@@ -397,17 +397,16 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len)
 {
     int max_token = 0;
     gsize loop;
+
     for (loop = 0; loop < len - 1; loop++)
-    {
         if (str[loop] == '\\' && g_ascii_isdigit (str[loop + 1]))
         {
             if (strutils_is_char_escaped (str, &str[loop]))
                 continue;
             if (max_token < str[loop + 1] - '0')
                 max_token = str[loop + 1] - '0';
-            continue;
         }
-        if (str[loop] == '$' && str[loop + 1] == '{')
+        else if (str[loop] == '$' && str[loop + 1] == '{')
         {
             gsize tmp_len;
 
@@ -430,7 +429,7 @@ mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len)
                 g_free (tmp_str);
             }
         }
-    }
+
     return max_token;
 }
 

diff --git a/lib/search/search.c b/lib/search/search.c
@@ -2,7 +2,7 @@
    Search text engine.
    Interface functions
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/serialize.c b/lib/serialize.c
@@ -1,7 +1,7 @@
 /*
    Provides a serialize/unserialize functionality for INI-like formats.
 
-   Copyright (C) 2011-2023
+   Copyright (C) 2011-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/shell.c b/lib/shell.c
@@ -1,7 +1,7 @@
 /*
    Provides a functions for working with shell.
 
-   Copyright (C) 2006-2023
+   Copyright (C) 2006-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c
@@ -2,7 +2,7 @@
    Skins engine.
    Work with colors - backward compatibility
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/skin/colors.c b/lib/skin/colors.c
@@ -2,7 +2,7 @@
    Skins engine.
    Work with colors
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/skin/common.c b/lib/skin/common.c
@@ -2,7 +2,7 @@
    Skins engine.
    Interface functions
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c
@@ -2,7 +2,7 @@
    Skins engine.
    Set of hardcoded skins
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c
@@ -2,7 +2,7 @@
    Skins engine.
    Reading and parse ini-files
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/skin/lines.c b/lib/skin/lines.c
@@ -2,7 +2,7 @@
    Skins engine.
    Work with line draving chars.
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/strutil/replace.c b/lib/strutil/replace.c
@@ -1,7 +1,7 @@
 /*
    Functions for replacing substrings in strings.
 
-   Copyright (C) 2013-2023
+   Copyright (C) 2013-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/strutil/strescape.c b/lib/strutil/strescape.c
@@ -1,7 +1,7 @@
 /*
    Functions for escaping and unescaping strings
 
-   Copyright (C) 2009-2023
+   Copyright (C) 2009-2024
    Free Software Foundation, Inc.
 
    Written by:

diff --git a/lib/strutil/strutil.c b/lib/strutil/strutil.c
@@ -1,7 +1,7 @@
 /*
    Common strings utilities
 
-   Copyright (C) 2007-2023
+   Copyright (C) 2007-2024
    Free Software Foundation, Inc.
 
    Written by: