Merge branch '4426_cleanup'

* 4426_cleanup: (38 commits)
  Update po/*.po files.
  (edit_find_editor): rename from find_editor.
  Listbox window: rename functions.
  (buttonbar_find): rename from find_buttonbar.
  Menu: rename functions.
  (advanced_chown_cmd): use intermediate variables to make text more readable.
  Use mc_fgetflags() and mc_fsetflags() where needed.
  VFS: mc_fgetflags, mc_fsetflags: new APIs.
  Minor optimization of chown/chmod/chattr operations.
  (operate_single_file): clarify creation of file operation UI.
  (dlg_default_destroy): send MSG_DESTROY to the dialog itself
  Collect all editor options to structure.
  Add EDIT and CONST_EDIT macros.
  usermenu: clarify compilation w/o internal editor.
  src/editor/spell.c: add missed #include.
  Update template for .c files.
  (do_search): remove intermediate variable.
  (do_search): get rid of string duplication.
  Change WDialog::data from void* to union{void*, int}
  Don't create an empty string in WLabel objects.
  ...

doc/man/ru/mc.1.in

@@ -284,7 +284,7 @@ S\-<символ> означает, что нужно держать в нажа
 Все строки ввода в Midnight Commander по умолчанию поддерживают соглашения
 об использовании "горячих" клавиш, принятые в редакторе GNU Emacs.
 .PP
-Вы можете переопределить клавиатурные привязки "горячих" клавищ к командам,
+Вы можете переопределить клавиатурные привязки "горячих" клавиш к командам,
 как это описано в разделе
 .\"LINK2"
 .I переопределение клавиатурных команд
@@ -1025,7 +1025,7 @@ half name | size:7 | type mode:3
 предназначена для ввода регулярного выражения (маски) для выбора файлов.
 Если включена опция
 .IR "Только файлы" ,
-то фильтроваться будут только файлы, а все каталоги будут отбражаться
+то фильтроваться будут только файлы, а все каталоги будут отображаться
 независимо от того, соответствуют они фильтру или нет. В противном случае
 фильтроваться будут как файлы, так и каталоги. Если включена опция
 .IR "Образцы в стиле shell" ,
@@ -1333,7 +1333,7 @@ Midnight Commander за счет добавления в личное меню
 .PP
 По команде
 .I "Отключить панели"
-показывается вывод последней из выполнявшихся команд облочки. Эта команда
+показывается вывод последней из выполнявшихся команд оболочки. Эта команда
 работает только через xterm и на консоли Linux и FreeBSD. "Горячие" клавиши \-
 .BR C\-o .
 .PP
@@ -1407,7 +1407,7 @@ Midnight Commander за счет добавления в личное меню
 .I "Список экранов"
 .\"Screen selector"
 отображает диалоговое окно со списком одновременно работающих в данный
-момент встроенноых редакторов, программ просмотра и других модулей MC,
+момент встроенных редакторов, программ просмотра и других модулей MC,
 поддерживающих такой режим работы.
 .PP
 После выбора пункта меню
@@ -1477,7 +1477,7 @@ Midnight Commander создаёт дерево путем просмотра т
 режимами перемещения по дереву.
 .TP
 В статическом режиме перемещения для выбора каталога (то есть перемещения
-подсветки на имя другого каталога) используются только коавиши
+подсветки на имя другого каталога) используются только клавиши
 .BR Up/Down .
 Показываются все известные программе на данный момент подкаталоги.
 .TP
@@ -1486,7 +1486,7 @@ Midnight Commander создаёт дерево путем просмотра т
 используются для перехода на соседний каталог того же уровня. Для перехода
 в родительский каталог используется клавиша
 .BR Left ,
-а по коавише
+а по клавише
 .B Right
 происходит переход к потомкам текущего каталога, то есть на один уровень
 ниже. При этом отображаются только вышележащие каталоги (включая
@@ -1982,7 +1982,7 @@ mc на экране.
 для использования однократного нажатия на клавишу Esc. По умолчанию этот
 интервал равен 1 секунде (1000000 микросекунд). Кроме того, этот интервал
 может быть установлен через переменную окружения KEYBOARD_KEY_TIMEOUT_US
-(также в микросекундах), которая имеет приоритет над над значеним этой
+(также в микросекундах), которая имеет приоритет над над значением этой
 опции.
 .PP
 .B Пауза после исполнения
@@ -2137,7 +2137,7 @@ Commander. Параметры, задаваемые в этом окне, дел
 Alt\-, (Alt\-запятая).
 .PP
 .IR "Равные размеры" .
-По умолчанию панели имеют равные разменры. Эта опция позволяет изменить их.
+По умолчанию панели имеют равные размеры. Эта опция позволяет изменить их.
 .PP
 .BR "Консольный вывод" .
 .PP
@@ -2232,7 +2232,7 @@ Commander будет использовать для вывода содержи
 .PP
 .IR "Автосохранение настроек панелей" .
 Если опция включена (по умолчанию она выключена), то при выходе из
-Midnight Commander'а текущие настройки панелей соханяются в файле
+Midnight Commander'а текущие настройки панелей сохраняются в файле
 ~/.config/mc/panels.ini.
 .PP
 .B Навигация
@@ -2305,12 +2305,12 @@ Commander, выделены цветом, определённым ключев
 .SH "    Подтверждения"
 Используя это диалоговое окно, вы можете сделать так, чтобы перед
 выполнением операций удаления, перезаписи файла, запуска файла на выполнение,
-перед выходом из программы MC, перед удаленим каталога из каталогов быстрого
+перед выходом из программы MC, перед удалением каталога из каталогов быстрого
 доступа, а также перед очисткой истории выдавался дополнительный запрос
 на подтверждение.
 .\"NODE "    Appearance"
 .SH "    Оформление"
-Используя это диалоговое окно, вы можете выбрать скин и разрещить отрисовку
+Используя это диалоговое окно, вы можете выбрать скин и разрешить отрисовку
 теней у диалоговых окон и выпадающих меню.
 .PP
 Для получения более подробной информации о скинах обратитесь к разделу
@@ -2787,7 +2787,7 @@ subshell, в файле
 одну из экранных кнопок):
 .TP
 .B [Отметить всё]
-отмеченные атрибуты (и только они) будут установлены в соотвтествии
+отмеченные атрибуты (и только они) будут установлены в соответствии
 с состоянием кнопок-флажков, причём для всех выбранных (помеченных) файлов.
 Если атрибут не был отмечен, его значение для выбранных файлов не изменяется.
 .TP
@@ -2879,7 +2879,7 @@ chattr \- команде изменения атрибутов файлов и
 одну из экранных кнопок):
 .TP
 .B [Отметить всё]
-отмеченные атрибуты (и только они) будут установлены в соотвтествии
+отмеченные атрибуты (и только они) будут установлены в соответствии
 с состоянием кнопок-флажков, причём для всех выбранных (помеченных) файлов.
 Если атрибут не был отмечен, его значение для выбранных файлов не изменяется.
 .TP
@@ -3172,7 +3172,7 @@ mcdiff \- это встроенное средство для сравнения
 Редактирование файла в правой панели.
 .TP
 .B F5
-Произвести слияние текушего изменения.
+Произвести слияние текущего изменения.
 .TP
 .B F7
 Вызов диалогового окна для задания шаблона поиска.
@@ -3499,11 +3499,11 @@ Midnight Commander поддерживает возможность одновр
 экраном.
 .PP
 Есть три способа переключения между экранами:
-переходк к следующему экрану в списке клавиатурной комбинацией
+переход к следующему экрану в списке клавиатурной комбинацией
 .BR Alt\-} ,
-переходк к предыдущему экрану в списке клавиатурной комбинацией
+переход к предыдущему экрану в списке клавиатурной комбинацией
 .BR Alt\-{ ,
-вызов дилогового окна со списком экранов клавиатурной комбинацией
+вызов диалогового окна со списком экранов клавиатурной комбинацией
 .B Alt\-`
 или с помощью пункта меню.
 Все эти комбинации клавиш одинаковы во всех экранах.
@@ -3755,7 +3755,7 @@ bash\-совместимая оболочка shell.
 .nf
     'C' \- использовать сжатие;
     'r' \- использовать rsh вместо ssh;
-    port \- использовать данный порт для поключения к удалённому компьютеру.
+    port \- использовать данный порт для подключения к удалённому компьютеру.
 .fi
 .PP
 Если задан элемент
@@ -3793,7 +3793,7 @@ bash\-совместимая оболочка shell.
 этим именем, в противном случае \- под тем именем, с которым вы
 зарегистрированы в локальной системе. Если задан
 .I port
-то он будет использован для поключения к удалённому компьютеру.
+то он будет использован для подключения к удалённому компьютеру.
 Если задан элемент
 .IR remote\-dir ,
 то указанный каталог станет текущим после соединения с удалённым компьютером.
@@ -3853,7 +3853,7 @@ SCSI\-диска, нужно использовать следующее имя:
 Внешняя файловая система позволяет очень просто интегрировать новые
 файловые контейнера и типы файлов простым написанием скриптов.
 .PP
-Файловая система Extfs подраздляется на две категории:
+Файловая система Extfs подразделяется на две категории:
 .PP
 1. Автономные файловые системы, которые не ассоциированы ни с одним из
 типов файлов.они представляют некоторые системные данные как дерево каталогов
@@ -4170,7 +4170,7 @@ menuhotsel=yellow;black;bold+underline
 .\"Skins sections"
 .br
 .\"LINK2"
-Опеределения цветовых пар
+Определения цветовых пар
 .\"Skins colors"
 .br
 .\"LINK2"
@@ -4224,7 +4224,7 @@ menuhotsel=yellow;black;bold+underline
 курсор на отмеченных данных
 .TP
 .I gauge
-цвет заполненной части индиктора прогресса
+цвет заполненной части индикатора прогресса
 .TP
 .I input
 элемент ввода данных
@@ -4375,7 +4375,7 @@ menuhotsel=yellow;black;bold+underline
 
 .\"NODE "  Skins aliases"
 .SH "  Псевдонимы цветов и атрибутов"
-Эта необязательная секция содержит опреления псевдонимов цветов (не цветовых пар)
+Эта необязательная секция содержит определения псевдонимов цветов (не цветовых пар)
 и атрибутов. Псевдоним представляет собой части определения параметров скина.
 В определение псевдонима может использоваться другой псевдоним, но при этом
 не должны образовываться циклические ссылки.
@@ -4480,11 +4480,11 @@ menuhotsel=yellow;black;bold+underline
 Регулярное выражение. Если присутствует, параметр 'extensions' игнорируется.
 .TP
 .I extensions
-Список расширений файлов. Раасширения разделяются символом ';'.
+Список расширений файлов. Расширения разделяются символом ';'.
 .TP
 .I extensions_case
 (имеет смысл только с параметром 'extensions') делает правило 'extensions'
-чувствительным к регистру букв (true) или не чувтсвительным (false).
+чувствительным к регистру букв (true) или не чувствительным (false).
 .PP
 Параметр 'type' (тип файла) может принимать значения:
 .nf
@@ -4697,11 +4697,11 @@ Midnight Commander позволяет задать некоторые парам
 MC надеется, что она имеет собственную функцию открытия файла в том же самом месте,
 где он был закрыт в предыдущий раз. Такую функцию имеет, например, редактор "joe"
 и многие другие. MC не препятствует внешней программе редактирования или просмотра
-самостоятельно сохранять и восстановливать позиции в открываемых файлах.
+самостоятельно сохранять и восстанавливать позиции в открываемых файлах.
 .\"NODE "Terminal databases"
 .SH "Базы терминалов"
 Midnight Commander обеспечивает возможность внесения исправлений в
-системную базу терминалов, даже если вы не обладаёте правами
+системную базу терминалов, даже если вы не обладаете правами
 суперпользователя. Midnight Commander ищет в системном инициализационном
 файле (файл
 .B mc.lib

lib/Makefile.am

@@ -32,6 +32,7 @@ SRC_mc_utils = \
 libmc_la_SOURCES = \
 	$(SUBLIB_includes) \
 	$(SRC_mc_utils) \
+	file-entry.h \
 	fileloc.h \
 	fs.h \
 	hook.c hook.h \

lib/charsets.c

@@ -58,8 +58,11 @@ const char *cp_source = NULL;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
@@ -78,10 +81,9 @@ new_codepage_desc (const char *id, const char *name)
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-free_codepage_desc (gpointer data, gpointer user_data)
+free_codepage_desc (gpointer data)
 {
     codepage_desc *desc = (codepage_desc *) data;
-    (void) user_data;
 
     g_free (desc->id);
     g_free (desc->name);
@@ -216,7 +218,7 @@ load_codepages_list (void)
         /* files are not found, add default codepage */
         fprintf (stderr, "%s\n", _("Warning: cannot load codepages list"));
 
-        codepages = g_ptr_array_new ();
+        codepages = g_ptr_array_new_with_free_func (free_codepage_desc);
         g_ptr_array_add (codepages, new_codepage_desc (DEFAULT_CHARSET, _("7-bit ASCII")));
     }
 }
@@ -226,7 +228,6 @@ load_codepages_list (void)
 void
 free_codepages_list (void)
 {
-    g_ptr_array_foreach (codepages, free_codepage_desc, NULL);
     g_ptr_array_free (codepages, TRUE);
     /* NULL-ize pointer to make unit tests happy */
     codepages = NULL;

lib/event/manage.c

@@ -38,24 +38,20 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
 static void
 mc_event_group_destroy_value (gpointer data)
 {
-    GPtrArray *callbacks;
+    g_ptr_array_free ((GPtrArray *) data, TRUE);
-
-    callbacks = (GPtrArray *) data;
-    g_ptr_array_foreach (callbacks, (GFunc) g_free, NULL);
-    g_ptr_array_free (callbacks, TRUE);
 }
 
-/* --------------------------------------------------------------------------------------------- */
-
-
 /* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
@@ -64,7 +60,6 @@ gboolean
 mc_event_add (const gchar * event_group_name, const gchar * event_name,
               mc_event_callback_func_t event_callback, gpointer event_init_data, GError ** mcerror)
 {
-
     GTree *event_group;
     GPtrArray *callbacks;
     mc_event_callback_t *cb;
@@ -120,12 +115,8 @@ mc_event_del (const gchar * event_group_name, const gchar * event_name,
         return;
 
     cb = mc_event_is_callback_in_array (callbacks, event_callback, event_init_data);
-
+    if (cb != NULL)
-    if (cb == NULL)
-        return;
-
         g_ptr_array_remove (callbacks, (gpointer) cb);
-    g_free ((gpointer) cb);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -194,7 +185,7 @@ mc_event_get_event_by_name (GTree * event_group, const gchar * event_name, gbool
     callbacks = (GPtrArray *) g_tree_lookup (event_group, (gconstpointer) event_name);
     if (callbacks == NULL && create_new)
     {
-        callbacks = g_ptr_array_new ();
+        callbacks = g_ptr_array_new_with_free_func (g_free);
         if (callbacks == NULL)
         {
             mc_propagate_error (mcerror, 0, _("Unable to create event '%s'!"), event_name);

lib/file-entry.h

@@ -0,0 +1,49 @@
+/** \file lib/file-entry.h
+ *  \brief Header: file entry definition
+ */
+
+#ifndef MC__ILE_ENTRY_H
+#define MC__ILE_ENTRY_H
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "lib/global.h"         /* include <glib.h> */
+
+/*** typedefs(not structures) and defined constants **********************************************/
+
+/*** enums ***************************************************************************************/
+
+/*** structures declarations (and typedefs of structures)*****************************************/
+
+/* keys are set only during sorting */
+typedef struct
+{
+    /* File name */
+    GString *fname;
+    /* File attributes */
+    struct stat st;
+    /* Key used for comparing names */
+    char *sort_key;
+    /* Key used for comparing extensions */
+    char *second_sort_key;
+
+    /* Flags */
+    struct
+    {
+        unsigned int marked:1;  /* File marked in pane window */
+        unsigned int link_to_dir:1;     /* If this is a link, does it point to directory? */
+        unsigned int stale_link:1;      /* If this is a symlink and points to Charon's land */
+        unsigned int dir_size_computed:1;       /* Size of directory was computed with dirsizes_cmd */
+    } f;
+} file_entry_t;
+
+/*** global variables defined in .c file *********************************************************/
+
+/*** declarations of public functions ************************************************************/
+
+/* --------------------------------------------------------------------------------------------- */
+/*** inline functions ****************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
+
+#endif /* MC__FILE_ENTRY_H */

lib/filehighlight.h

@@ -2,7 +2,7 @@
 #define MC__FILEHIGHLIGHT_H
 
 #include "lib/mcconfig.h"       /* mc_config_t */
-#include "lib/util.h"           /* file_entry_t */
+#include "lib/file-entry.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

lib/filehighlight/common.c

@@ -27,7 +27,10 @@
 #include <config.h>
 
 #include "lib/global.h"
+#include "lib/util.h"           /* MC_PTR_FREE */
+
 #include "lib/filehighlight.h"
+
 #include "internal.h"
 
 /*** global variables ****************************************************************************/
@@ -38,10 +41,16 @@
 
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
-static void
+/* --------------------------------------------------------------------------------------------- */
-mc_fhl_filter_free (void *data)
+/*** public functions ****************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
+
+void
+mc_fhl_filter_free (gpointer data)
 {
     mc_fhl_filter_t *filter = (mc_fhl_filter_t *) data;
 
@@ -58,13 +67,11 @@ mc_fhl_array_free (mc_fhl_t * fhl)
 {
     if (fhl->filters != NULL)
     {
-        g_ptr_array_foreach (fhl->filters, (GFunc) mc_fhl_filter_free, NULL);
+        g_ptr_array_free (fhl->filters, TRUE);
-        fhl->filters = (GPtrArray *) g_ptr_array_free (fhl->filters, TRUE);
+        fhl->filters = NULL;
     }
 }
 
-/* --------------------------------------------------------------------------------------------- */
-/*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
 mc_fhl_t *

lib/filehighlight/get-color.c

@@ -39,10 +39,12 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
-
 /* --------------------------------------------------------------------------------------------- */
 
 /*inline functions */
@@ -55,12 +57,16 @@ mc_fhl_is_file (const file_entry_t * fe)
     return S_ISREG (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_file_exec (const file_entry_t * fe)
 {
     return is_exe (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_dir (const file_entry_t * fe)
 {
@@ -70,6 +76,8 @@ mc_fhl_is_dir (const file_entry_t * fe)
     return S_ISDIR (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_link (const file_entry_t * fe)
 {
@@ -79,24 +87,32 @@ mc_fhl_is_link (const file_entry_t * fe)
     return S_ISLNK (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_hlink (const file_entry_t * fe)
 {
     return (fe->st.st_nlink > 1);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_link_to_dir (const file_entry_t * fe)
 {
     return mc_fhl_is_link (fe) && fe->f.link_to_dir;
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_stale_link (const file_entry_t * fe)
 {
     return mc_fhl_is_link (fe) ? fe->f.stale_link : !mc_fhl_is_file (fe);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_device_char (const file_entry_t * fe)
 {
@@ -106,6 +122,8 @@ mc_fhl_is_device_char (const file_entry_t * fe)
     return S_ISCHR (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_device_block (const file_entry_t * fe)
 {
@@ -115,6 +133,8 @@ mc_fhl_is_device_block (const file_entry_t * fe)
     return S_ISBLK (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_special_socket (const file_entry_t * fe)
 {
@@ -124,6 +144,8 @@ mc_fhl_is_special_socket (const file_entry_t * fe)
     return S_ISSOCK (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_special_fifo (const file_entry_t * fe)
 {
@@ -133,6 +155,8 @@ mc_fhl_is_special_fifo (const file_entry_t * fe)
     return S_ISFIFO (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_special_door (const file_entry_t * fe)
 {
@@ -142,6 +166,8 @@ mc_fhl_is_special_door (const file_entry_t * fe)
     return S_ISDOOR (fe->st.st_mode);
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
 inline static gboolean
 mc_fhl_is_special (const file_entry_t * fe)
 {
@@ -246,8 +272,6 @@ mc_fhl_get_color_regexp (const mc_fhl_filter_t * mc_filter, const mc_fhl_t * fhl
     return -1;
 }
 
-/* --------------------------------------------------------------------------------------------- */
-
 /* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */

lib/filehighlight/ini-file-read.c

@@ -32,6 +32,7 @@
 #include "lib/strescape.h"
 #include "lib/skin.h"
 #include "lib/util.h"           /* exist_file() */
+
 #include "lib/filehighlight.h"
 
 #include "internal.h"
@@ -42,8 +43,11 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
@@ -51,6 +55,7 @@ static void
 mc_fhl_parse_fill_color_info (mc_fhl_filter_t * mc_filter, mc_fhl_t * fhl, const gchar * group_name)
 {
     (void) fhl;
+
     mc_filter->color_pair_index = mc_skin_color_get ("filehighlight", group_name);
 }
 
@@ -71,8 +76,9 @@ mc_fhl_parse_get_file_type_id (mc_fhl_t * fhl, const gchar * group_name)
         NULL
     };
     int i;
-    gchar *param_type = mc_config_get_string (fhl->config, group_name, "type", "");
+    gchar *param_type;
 
+    param_type = mc_config_get_string (fhl->config, group_name, "type", "");
     if (*param_type == '\0')
     {
         g_free (param_type);
@@ -80,11 +86,11 @@ mc_fhl_parse_get_file_type_id (mc_fhl_t * fhl, const gchar * group_name)
     }
 
     for (i = 0; types[i] != NULL; i++)
-    {
         if (strcmp (types[i], param_type) == 0)
             break;
-    }
+
     g_free (param_type);
+
     if (types[i] == NULL)
         return FALSE;
 
@@ -94,6 +100,7 @@ mc_fhl_parse_get_file_type_id (mc_fhl_t * fhl, const gchar * group_name)
     mc_fhl_parse_fill_color_info (mc_filter, fhl, group_name);
 
     g_ptr_array_add (fhl->filters, (gpointer) mc_filter);
+
     return TRUE;
 }
 
@@ -103,8 +110,9 @@ static gboolean
 mc_fhl_parse_get_regexp (mc_fhl_t * fhl, const gchar * group_name)
 {
     mc_fhl_filter_t *mc_filter;
-    gchar *regexp = mc_config_get_string (fhl->config, group_name, "regexp", "");
+    gchar *regexp;
 
+    regexp = mc_config_get_string (fhl->config, group_name, "regexp", "");
     if (*regexp == '\0')
     {
         g_free (regexp);
@@ -120,6 +128,7 @@ mc_fhl_parse_get_regexp (mc_fhl_t * fhl, const gchar * group_name)
     mc_fhl_parse_fill_color_info (mc_filter, fhl, group_name);
     g_ptr_array_add (fhl->filters, (gpointer) mc_filter);
     g_free (regexp);
+
     return TRUE;
 }
 
@@ -151,6 +160,7 @@ mc_fhl_parse_get_extensions (mc_fhl_t * fhl, const gchar * group_name)
         g_string_append (buf, esc_ext);
         g_free (esc_ext);
     }
+
     g_strfreev (exts_orig);
 
     g_string_prepend (buf, ".*\\.(");
@@ -166,6 +176,7 @@ mc_fhl_parse_get_extensions (mc_fhl_t * fhl, const gchar * group_name)
     mc_fhl_parse_fill_color_info (mc_filter, fhl, group_name);
     g_ptr_array_add (fhl->filters, (gpointer) mc_filter);
     g_string_free (buf, TRUE);
+
     return TRUE;
 }
 
@@ -183,6 +194,7 @@ mc_fhl_read_ini_file (mc_fhl_t * fhl, const gchar * filename)
         return mc_config_read_file (fhl->config, filename, TRUE, FALSE);
 
     fhl->config = mc_config_init (filename, TRUE);
+
     return (fhl->config != NULL);
 }
 
@@ -224,7 +236,7 @@ mc_fhl_parse_ini_file (mc_fhl_t * fhl)
     gboolean ok;
 
     mc_fhl_array_free (fhl);
-    fhl->filters = g_ptr_array_new ();
+    fhl->filters = g_ptr_array_new_with_free_func (mc_fhl_filter_free);
 
     orig_group_names = mc_config_get_groups (fhl->config, NULL);
     ok = (*orig_group_names != NULL);

lib/filehighlight/internal.h

@@ -51,6 +51,7 @@ typedef struct mc_fhl_filter_struct
 
 /*** declarations of public functions ************************************************************/
 
+void mc_fhl_filter_free (gpointer data);
 void mc_fhl_array_free (mc_fhl_t * fhl);
 
 gboolean mc_fhl_init_from_standard_files (mc_fhl_t * fhl);

lib/keybind.c

@@ -51,6 +51,8 @@ typedef struct name_keymap_t
     long val;
 } name_keymap_t;
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static name_keymap_t command_names[] = {
@@ -382,6 +384,7 @@ static name_keymap_t command_names[] = {
 static const size_t num_command_names = G_N_ELEMENTS (command_names) - 1;
 /* *INDENT-ON* */
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/lock.c

@@ -75,8 +75,11 @@ typedef struct
     pid_t pid;
 } lock_s;
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 /** \fn static char * lock_build_name (void)

lib/logging.c

@@ -49,11 +49,14 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static gboolean logging_initialized = FALSE;
 static gboolean logging_enabled = FALSE;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/mcconfig/common.c

@@ -39,6 +39,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/mcconfig/paths.c

@@ -42,6 +42,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static gboolean xdg_vars_initialized = FALSE;

lib/mcconfig/set.c

@@ -33,6 +33,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/search/glob.c

@@ -39,9 +39,13 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static GString *
 mc_search__glob_translate_to_regex (const GString * astr)

lib/search/hex.c

@@ -49,9 +49,13 @@ typedef enum
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static GString *
 mc_search__hex_translate_to_regex (const GString * astr, mc_search_hex_parse_error_t * error_ptr,
@@ -127,7 +131,9 @@ mc_search__hex_translate_to_regex (const GString * astr, mc_search_hex_parse_err
     return buff;
 }
 
+/* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 void
 mc_search__cond_struct_new_init_hex (const char *charset, mc_search_t * lc_mc_search,

lib/search/lib.c

@@ -41,11 +41,13 @@
 
 /*** global variables ****************************************************************************/
 
+/* *INDENT-OFF* */
 const char *STR_E_NOTFOUND = N_("Search string not found");
 const char *STR_E_UNKNOWN_TYPE = N_("Not implemented yet");
 const char *STR_E_RPL_NOT_EQ_TO_FOUND =
-N_("Num of replace tokens not equal to num of found tokens");
+            N_("Num of replace tokens not equal to num of found tokens");
 const char *STR_E_RPL_INVALID_TOKEN = N_("Invalid token number %d");
+/* *INDENT-ON* */
 
 /*** file scope macro definitions ****************************************************************/
 
@@ -53,6 +55,8 @@ const char *STR_E_RPL_INVALID_TOKEN = N_("Invalid token number %d");
 
 typedef gboolean (*case_conv_fn) (const char *ch, char **out, size_t * remain);
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/search/normal.c

@@ -38,6 +38,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/search/regex.c

@@ -57,10 +57,13 @@ typedef enum
     REPLACE_T_LOW_TRANSFORM = 8
 } replace_transform_type_t;
 
+/*** forward declarations (file scope functions) *************************************************/
 
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static gboolean
 mc_search__regex_str_append_if_special (GString * copy_to, const GString * regex_str,

lib/search/search.c

@@ -47,6 +47,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static const mc_search_type_str_t mc_search__list_types[] = {
@@ -57,7 +59,9 @@ static const mc_search_type_str_t mc_search__list_types[] = {
     {NULL, MC_SEARCH_T_INVALID}
 };
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static mc_search_cond_t *
 mc_search__cond_struct_new (mc_search_t * lc_mc_search, const GString * str, const char *charset)
@@ -91,8 +95,10 @@ mc_search__cond_struct_new (mc_search_t * lc_mc_search, const GString * str, con
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-mc_search__cond_struct_free (mc_search_cond_t * mc_search_cond)
+mc_search__cond_struct_free (gpointer data)
 {
+    mc_search_cond_t *mc_search_cond = (mc_search_cond_t *) data;
+
     if (mc_search_cond->upper != NULL)
         g_string_free (mc_search_cond->upper, TRUE);
 
@@ -112,15 +118,6 @@ mc_search__cond_struct_free (mc_search_cond_t * mc_search_cond)
     g_free (mc_search_cond);
 }
 
-/* --------------------------------------------------------------------------------------------- */
-
-static void
-mc_search__conditions_free (GPtrArray * array)
-{
-    g_ptr_array_foreach (array, (GFunc) mc_search__cond_struct_free, NULL);
-    g_ptr_array_free (array, TRUE);
-}
-
 /* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
@@ -187,7 +184,7 @@ mc_search_free (mc_search_t * lc_mc_search)
     g_free (lc_mc_search->error_str);
 
     if (lc_mc_search->prepared.conditions != NULL)
-        mc_search__conditions_free (lc_mc_search->prepared.conditions);
+        g_ptr_array_free (lc_mc_search->prepared.conditions, TRUE);
 
 #ifdef SEARCH_TYPE_GLIB
     if (lc_mc_search->regex_match_info != NULL)
@@ -212,7 +209,7 @@ mc_search_prepare (mc_search_t * lc_mc_search)
     if (lc_mc_search->prepared.conditions != NULL)
         return lc_mc_search->prepared.result;
 
-    ret = g_ptr_array_new ();
+    ret = g_ptr_array_new_with_free_func (mc_search__cond_struct_free);
 #ifdef HAVE_CHARSET
     if (!lc_mc_search->is_all_charsets)
         g_ptr_array_add (ret,

lib/serialize.c

@@ -46,8 +46,11 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/shell.c

@@ -37,17 +37,19 @@
 #include "global.h"
 #include "util.h"
 
-
 /*** global variables ****************************************************************************/
 
 /*** file scope macro definitions ****************************************************************/
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static char rp_shell[PATH_MAX];
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 /**

lib/skin/colors-old.c

@@ -39,6 +39,8 @@
 
 /*** file scope macro definitions ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope type declarations ****************************************************************/
 
 typedef struct mc_skin_colors_old_struct
@@ -104,7 +106,9 @@ static const mc_skin_colors_old_t old_colors[] = {
 
 static const size_t num_old_colors = G_N_ELEMENTS (old_colors);
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static int
 old_color_comparator (const void *p1, const void *p2)

lib/skin/colors.c

@@ -41,9 +41,13 @@ int mc_skin_color__cache[MC_SKIN_COLOR_CACHE_COUNT];
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static mc_skin_color_t *
 mc_skin_color_get_from_hash (mc_skin_t * mc_skin, const gchar * group, const gchar * key)

lib/skin/common.c

@@ -41,6 +41,8 @@ mc_skin_t mc_skin__default;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static gboolean mc_skin_is_init = FALSE;

lib/skin/ini-file.c

@@ -40,10 +40,12 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
-
 /* --------------------------------------------------------------------------------------------- */
 
 static void
@@ -133,7 +135,7 @@ mc_skin_list (void)
 {
     GPtrArray *list;
 
-    list = g_ptr_array_new ();
+    list = g_ptr_array_new_with_free_func (g_free);
     mc_skin_get_list_from_dir (mc_config_get_data_path (), list);
     mc_skin_get_list_from_dir (mc_global.sysconfig_dir, list);
     mc_skin_get_list_from_dir (mc_global.share_data_dir, list);

lib/skin/lines.c

@@ -36,9 +36,13 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static int
 mc_skin_lines_load_frm (mc_skin_t * mc_skin, const char *name)

lib/strutil/filevercmp.c

@@ -30,6 +30,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/strutil/replace.c

@@ -35,6 +35,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/strutil/strescape.c

@@ -35,15 +35,21 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static const char ESCAPE_SHELL_CHARS[] = " !#$%()&{}[]`?|<>;*\\\"'";
 static const char ESCAPE_REGEX_CHARS[] = "^!#$%()&{}[]`?|<>;*+.\\";
 static const char ESCAPE_GLOB_CHARS[] = "$*\\?";
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
+/* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 char *
 strutils_escape (const char *src, gsize src_len, const char *escaped_chars,
@@ -95,6 +101,7 @@ strutils_escape (const char *src, gsize src_len, const char *escaped_chars,
 }
 
 /* --------------------------------------------------------------------------------------------- */
+
 char *
 strutils_unescape (const char *src, gsize src_len, const char *unescaped_chars,
                    gboolean unescape_non_printable)

lib/strutil/strutil.c

@@ -44,6 +44,8 @@ GIConv str_cnv_not_convert = INVALID_CONV;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* names, that are used for utf-8 */

lib/strutil/strutil8bit.c

@@ -56,6 +56,8 @@ static inline int char_##func_name(char c)     \
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static const char replch = '?';

lib/strutil/strutilascii.c

@@ -41,6 +41,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static const char replch = '?';

lib/strutil/strutilutf8.c

@@ -57,6 +57,8 @@ struct term_form
     gboolean compose;
 };
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static const char replch[] = "\xEF\xBF\xBD";

lib/strutil/xstrtol.c

@@ -39,6 +39,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/timefmt.c

@@ -53,6 +53,8 @@ char *user_old_timeformat = NULL;       /* time format string for older dates */
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /*
@@ -62,10 +64,12 @@ char *user_old_timeformat = NULL;       /* time format string for older dates */
  */
 static size_t i18n_timelength_cache = MAX_I18NTIMELENGTH + 1;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
+/* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
-
 /* --------------------------------------------------------------------------------------------- */
 /**
  * Check strftime() results. Some systems (i.e. Solaris) have different

lib/tty/color-internal.c

@@ -52,6 +52,8 @@ typedef struct mc_tty_color_table_struct
     int value;
 } mc_tty_color_table_t;
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static mc_tty_color_table_t const color_table[] = {

lib/tty/color-ncurses.c

@@ -48,10 +48,13 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static GHashTable *mc_tty_color_color_pair_attrs = NULL;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/tty/color-slang.c

@@ -48,8 +48,11 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/tty/color.c

@@ -57,10 +57,13 @@ gboolean use_colors = FALSE;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static GHashTable *mc_tty_color__hashtable = NULL;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/tty/key.c

@@ -275,6 +275,8 @@ typedef int (*ph_ov_f) (void *);
 typedef int (*ph_pqc_f) (unsigned short, PhCursorInfo_t *);
 #endif
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static key_define_t mc_default_keys[] = {

lib/tty/tty-ncurses.c

@@ -78,15 +78,16 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* ncurses supports cursor positions only within window */
 /* We use our own cursor coordinates to support partially visible widgets */
 static int mc_curs_row, mc_curs_col;
 
-/*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
-
+/*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
 static void

lib/tty/tty-slang.c

@@ -74,6 +74,8 @@ int reset_hp_softkeys = 0;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* Various saved termios settings that we control here */

lib/tty/tty.c

@@ -68,10 +68,13 @@ int mc_tty_frm[MC_TTY_FRM_MAX];
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static SIG_ATOMIC_VOLATILE_T got_interrupt = 0;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/tty/win.c

@@ -55,10 +55,13 @@ char *rmcup = NULL;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static gboolean rxvt_extensions = FALSE;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/tty/x11conn.c

@@ -57,6 +57,8 @@
 typedef int (*mc_XErrorHandler_callback) (Display *, XErrorEvent *);
 typedef int (*mc_XIOErrorHandler_callback) (Display *);
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 #ifdef HAVE_GMODULE
@@ -66,6 +68,7 @@ static mc_XErrorHandler_callback (*func_XSetErrorHandler) (mc_XErrorHandler_call
 static mc_XIOErrorHandler_callback (*func_XSetIOErrorHandler) (mc_XIOErrorHandler_callback);
 static Bool (*func_XQueryPointer) (Display *, Window, Window *, Window *,
                                    int *, int *, int *, int *, unsigned int *);
+
 static GModule *x11_module;
 #endif
 
@@ -79,6 +82,7 @@ static gboolean lost_connection = FALSE;
 static jmp_buf x11_exception;   /* FIXME: get a better name */
 static gboolean longjmp_allowed = FALSE;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/util.c

@@ -72,6 +72,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/util.h

@@ -122,27 +122,6 @@ typedef struct
 
 /*** structures declarations (and typedefs of structures)*****************************************/
 
-/* keys are set only during sorting */
-typedef struct
-{
-    /* File attributes */
-    GString *fname;
-    struct stat st;
-    /* key used for comparing names */
-    char *sort_key;
-    /* key used for comparing extensions */
-    char *second_sort_key;
-
-    /* Flags */
-    struct
-    {
-        unsigned int marked:1;  /* File marked in pane window */
-        unsigned int link_to_dir:1;     /* If this is a link, does it point to directory? */
-        unsigned int stale_link:1;      /* If this is a symlink and points to Charon's land */
-        unsigned int dir_size_computed:1;       /* Size of directory was computed with dirsizes_cmd */
-    } f;
-} file_entry_t;
-
 /*** global variables defined in .c file *********************************************************/
 
 extern struct sigaction startup_handler;

lib/utilunix.c

@@ -103,6 +103,8 @@ typedef struct
     struct sigaction stop;
 } my_system_sigactions_t;
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static int_cache uid_cache[UID_CACHE_SIZE];

lib/vfs/direntry.c

@@ -98,6 +98,8 @@ struct dirhandle
 
 /*** file scope variables ************************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */

lib/vfs/gc.c

@@ -100,6 +100,8 @@ struct vfs_stamping
     gint64 time;
 };
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static GSList *stamps = NULL;

lib/vfs/interface.c

@@ -71,8 +71,11 @@ extern struct vfs_dirent *mc_readdir_result;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
@@ -250,6 +253,8 @@ int mc_##name inarg \
 
 MC_NAMEOP (chmod, (const vfs_path_t *vpath, mode_t mode), (vpath, mode))
 MC_NAMEOP (chown, (const vfs_path_t *vpath, uid_t owner, gid_t group), (vpath, owner, group))
+MC_NAMEOP (fgetflags, (const vfs_path_t *vpath, unsigned long *flags), (vpath, flags))
+MC_NAMEOP (fsetflags, (const vfs_path_t *vpath, unsigned long flags), (vpath, flags))
 MC_NAMEOP (utime, (const vfs_path_t *vpath, mc_timesbuf_t * times), (vpath, times))
 MC_NAMEOP (readlink, (const vfs_path_t *vpath, char *buf, size_t bufsiz), (vpath, buf, bufsiz))
 MC_NAMEOP (unlink, (const vfs_path_t *vpath), (vpath))

lib/vfs/netutil.c

@@ -43,8 +43,11 @@ SIG_ATOMIC_VOLATILE_T got_sigpipe = 0;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/vfs/parse_ls_vga.c

@@ -54,6 +54,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static char *columns[MAXCOLS];  /* Points to the string in column n */

lib/vfs/path.c

@@ -54,8 +54,11 @@ extern GPtrArray *vfs__classes_list;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/vfs/vfs.c

@@ -95,6 +95,8 @@ struct vfs_openfile
     void *fsinfo;
 };
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /** They keep track of the current directory */

lib/vfs/vfs.h

@@ -169,6 +169,10 @@ typedef struct vfs_class
 
     int (*chmod) (const vfs_path_t * vpath, mode_t mode);
     int (*chown) (const vfs_path_t * vpath, uid_t owner, gid_t group);
+
+    int (*fgetflags) (const vfs_path_t * vpath, unsigned long *flags);
+    int (*fsetflags) (const vfs_path_t * vpath, unsigned long flags);
+
     int (*utime) (const vfs_path_t * vpath, mc_timesbuf_t * times);
 
     int (*readlink) (const vfs_path_t * vpath, char *buf, size_t size);
@@ -318,6 +322,8 @@ int mc_symlink (const vfs_path_t * vpath1, const vfs_path_t * vpath2);
 int mc_rename (const vfs_path_t * vpath1, const vfs_path_t * vpath2);
 int mc_chmod (const vfs_path_t * vpath, mode_t mode);
 int mc_chown (const vfs_path_t * vpath, uid_t owner, gid_t group);
+int mc_fgetflags (const vfs_path_t * vpath, unsigned long *flags);
+int mc_fsetflags (const vfs_path_t * vpath, unsigned long flags);
 int mc_chdir (const vfs_path_t * vpath);
 int mc_unlink (const vfs_path_t * vpath);
 int mc_ctl (int fd, int ctlop, void *arg);

lib/widget/background.c

@@ -42,6 +42,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/buttonbar.c

@@ -52,8 +52,11 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
@@ -281,7 +284,7 @@ buttonbar_set_label (WButtonBar * bb, int idx, const char *text, const global_ke
 
 /* Find ButtonBar widget in the dialog */
 WButtonBar *
-find_buttonbar (const WDialog * h)
+buttonbar_find (const WDialog * h)
 {
     return BUTTONBAR (widget_find_by_type (CONST_WIDGET (h), buttonbar_callback));
 }

lib/widget/buttonbar.h

@@ -39,7 +39,7 @@ typedef struct WButtonBar
 WButtonBar *buttonbar_new (void);
 void buttonbar_set_label (WButtonBar * bb, int idx, const char *text,
                           const global_keymap_t * keymap, Widget * receiver);
-WButtonBar *find_buttonbar (const WDialog * h);
+WButtonBar *buttonbar_find (const WDialog * h);
 
 /*** inline functions ****************************************************************************/
 

lib/widget/check.c

@@ -47,9 +47,13 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
 check_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)

lib/widget/dialog-switch.c

@@ -46,6 +46,8 @@ WDialog *filemanager = NULL;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* List of dialogs: filemanagers, editors, viewers */
@@ -55,6 +57,7 @@ static GList *mc_current = NULL;
 /* Is there any dialogs that we have to run after returning to the manager from another dialog */
 static gboolean dialog_switch_pending = FALSE;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
@@ -229,7 +232,7 @@ dialog_switch_list (void)
     lines = MIN ((size_t) (LINES * 2 / 3), dlg_num);
     cols = COLS * 2 / 3;
 
-    listbox = create_listbox_window (lines, cols, _("Screens"), "[Screen selector]");
+    listbox = listbox_window_new (lines, cols, _("Screens"), "[Screen selector]");
 
     for (h = mc_dialogs; h != NULL; h = g_list_next (h))
     {
@@ -246,7 +249,7 @@ dialog_switch_list (void)
         g_free (title);
     }
 
-    selected = run_listbox_with_data (listbox, mc_current);
+    selected = listbox_run_with_data (listbox, mc_current);
     if (selected != NULL)
         dialog_switch_goto (selected);
 }

lib/widget/dialog.c

@@ -75,6 +75,8 @@ const global_keymap_t *dialog_map = NULL;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */
@@ -334,6 +336,7 @@ dlg_default_destroy (Widget * w)
     /* if some widgets have history, save all histories at one moment here */
     dlg_save_history (h);
     group_default_callback (w, NULL, MSG_DESTROY, 0, NULL);
+    send_message (w, NULL, MSG_DESTROY, 0, NULL);
     mc_event_group_del (h->event_group);
     g_free (h->event_group);
     g_free (h);
@@ -427,7 +430,7 @@ dlg_create (gboolean modal, int y1, int x1, int lines, int cols, widget_pos_flag
     new_d->colors = colors;
     new_d->help_ctx = help_ctx;
     new_d->compact = compact;
-    new_d->data = NULL;
+    new_d->data.p = NULL;
 
     if (modal)
     {

lib/widget/dialog.h

@@ -69,10 +69,16 @@ struct WDialog
     int ret_value;              /* Result of dlg_run() */
 
     /* Internal variables */
-    void *data;                 /* Data can be passed to dialog */
     char *event_group;          /* Name of event group for this dialog */
     Widget *bg;                 /* WFrame or WBackground */
 
+    /* Data can be passed to dialog */
+    union
+    {
+        void *p;
+        int i;
+    } data;
+
     dlg_shortcut_str get_shortcut;      /* Shortcut string */
     dlg_title_str get_title;    /* useless for modal dialogs */
 };

lib/widget/frame.c

@@ -45,6 +45,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/gauge.c

@@ -50,9 +50,13 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
 gauge_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)

lib/widget/group.c

@@ -60,6 +60,8 @@ typedef struct
     gboolean enable;
 } widget_state_info_t;
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/groupbox.c

@@ -48,9 +48,13 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
 groupbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)

lib/widget/history.c

@@ -61,9 +61,13 @@ typedef struct
     size_t max_width;
 } history_dlg_data;
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
 history_dlg_reposition (WDialog * dlg_head)
@@ -73,10 +77,10 @@ history_dlg_reposition (WDialog * dlg_head)
     WRect r;
 
     /* guard checks */
-    if ((dlg_head == NULL) || (dlg_head->data == NULL))
+    if (dlg_head == NULL || dlg_head->data.p == NULL)
         return MSG_NOT_HANDLED;
 
-    data = (history_dlg_data *) dlg_head->data;
+    data = (history_dlg_data *) dlg_head->data.p;
 
     y = data->y;
     he = data->count + 2;
@@ -227,7 +231,7 @@ history_show (history_descriptor_t * hd)
     query_dlg =
         dlg_create (TRUE, 0, 0, 4, 4, WPOS_KEEP_DEFAULT, TRUE, dialog_colors, history_dlg_callback,
                     NULL, "[History-query]", _("History"));
-    query_dlg->data = &hist_data;
+    query_dlg->data.p = &hist_data;
 
     /* this call makes list stick to all sides of dialog, effectively make
        it be resized with dialog */

lib/widget/hline.c

@@ -50,6 +50,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/input.c

@@ -75,12 +75,15 @@ input_colors_t input_colors;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* Input widgets have a global kill ring */
 /* Pointer to killed data */
 static char *kill_buffer = NULL;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

lib/widget/input_complete.c

@@ -87,6 +87,11 @@ typedef struct
     input_complete_t flags;
 } try_complete_automation_state_t;
 
+/*** forward declarations (file scope functions) *************************************************/
+
+char **try_complete (char *text, int *lc_start, int *lc_end, input_complete_t flags);
+void complete_engine_fill_completions (WInput * in);
+
 /*** file scope variables ************************************************************************/
 
 static char **hosts = NULL;
@@ -99,12 +104,10 @@ static int min_end;
 static int start = 0;
 static int end = 0;
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-char **try_complete (char *text, int *lc_start, int *lc_end, input_complete_t flags);
-void complete_engine_fill_completions (WInput * in);
-
 #ifdef DO_COMPLETION_DEBUG
 /**
  * Useful to print/debug completion flags

lib/widget/label.c

@@ -52,9 +52,13 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static cb_ret_t
 label_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data)

lib/widget/listbox-window.c

@@ -56,7 +56,7 @@
 /* --------------------------------------------------------------------------------------------- */
 
 Listbox *
-create_listbox_window_centered (int center_y, int center_x, int lines, int cols,
+listbox_window_centered_new (int center_y, int center_x, int lines, int cols,
                              const char *title, const char *help)
 {
     const int space = 4;
@@ -117,16 +117,16 @@ create_listbox_window_centered (int center_y, int center_x, int lines, int cols,
 /* --------------------------------------------------------------------------------------------- */
 
 Listbox *
-create_listbox_window (int lines, int cols, const char *title, const char *help)
+listbox_window_new (int lines, int cols, const char *title, const char *help)
 {
-    return create_listbox_window_centered (-1, -1, lines, cols, title, help);
+    return listbox_window_centered_new (-1, -1, lines, cols, title, help);
 }
 
 /* --------------------------------------------------------------------------------------------- */
 
 /** Returns the number of the item selected */
 int
-run_listbox (Listbox * l)
+listbox_run (Listbox * l)
 {
     int val = -1;
 
@@ -140,14 +140,14 @@ run_listbox (Listbox * l)
 /* --------------------------------------------------------------------------------------------- */
 
 /**
- * A variant of run_listbox() which is more convenient to use when we
+ * A variant of listbox_run() which is more convenient to use when we
  * need to select arbitrary 'data'.
  *
  * @param select  the item to select initially, by its 'data'. Optional.
  * @return        the 'data' of the item selected, or NULL if none selected.
  */
 void *
-run_listbox_with_data (Listbox * l, const void *select)
+listbox_run_with_data (Listbox * l, const void *select)
 {
     void *val = NULL;
 

lib/widget/listbox-window.h

@@ -25,11 +25,11 @@ typedef struct
 /*** declarations of public functions ************************************************************/
 
 /* Listbox utility functions */
-Listbox *create_listbox_window_centered (int center_y, int center_x, int lines, int cols,
+Listbox *listbox_window_centered_new (int center_y, int center_x, int lines, int cols,
                                       const char *title, const char *help);
-Listbox *create_listbox_window (int lines, int cols, const char *title, const char *help);
+Listbox *listbox_window_new (int lines, int cols, const char *title, const char *help);
-int run_listbox (Listbox * l);
+int listbox_run (Listbox * l);
-void *run_listbox_with_data (Listbox * l, const void *select);
+void *listbox_run_with_data (Listbox * l, const void *select);
 
 /*** inline functions ****************************************************************************/
 

lib/widget/listbox.c

@@ -55,9 +55,13 @@ const global_keymap_t *listbox_map = NULL;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
+/* --------------------------------------------------------------------------------------------- */
 
 static int
 listbox_entry_cmp (const void *a, const void *b, void *user_data)

lib/widget/menu.c

@@ -73,8 +73,11 @@ struct menu_t
     char *help_node;
 };
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
@@ -638,7 +641,7 @@ menubar_refresh (WMenuBar * menubar)
 static inline void
 menubar_free_menu (WMenuBar * menubar)
 {
-    g_clear_list (&menubar->menu, (GDestroyNotify) destroy_menu);
+    g_clear_list (&menubar->menu, (GDestroyNotify) menu_free);
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -880,7 +883,7 @@ menubar_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
 /* --------------------------------------------------------------------------------------------- */
 
 menu_entry_t *
-menu_entry_create (const char *name, long command)
+menu_entry_new (const char *name, long command)
 {
     menu_entry_t *entry;
 
@@ -909,7 +912,7 @@ menu_entry_free (menu_entry_t * entry)
 /* --------------------------------------------------------------------------------------------- */
 
 menu_t *
-create_menu (const char *name, GList * entries, const char *help_node)
+menu_new (const char *name, GList * entries, const char *help_node)
 {
     menu_t *menu;
 
@@ -937,7 +940,7 @@ menu_set_name (menu_t * menu, const char *name)
 /* --------------------------------------------------------------------------------------------- */
 
 void
-destroy_menu (menu_t * menu)
+menu_free (menu_t * menu)
 {
     hotkey_free (menu->text);
     g_list_free_full (menu->entries, (GDestroyNotify) menu_entry_free);
@@ -1050,7 +1053,7 @@ menubar_arrange (WMenuBar * menubar)
 /** Find MenuBar widget in the dialog */
 
 WMenuBar *
-find_menubar (const WDialog * h)
+menubar_find (const WDialog * h)
 {
     return MENUBAR (widget_find_by_type (CONST_WIDGET (h), menubar_callback));
 }

lib/widget/menu.h

@@ -13,7 +13,7 @@
 
 #define MENUBAR(x) ((WMenuBar *)(x))
 
-#define menu_separator_create() NULL
+#define menu_separator_new() NULL
 
 /*** enums ***************************************************************************************/
 
@@ -42,19 +42,19 @@ extern const global_keymap_t *menu_map;
 
 /*** declarations of public functions ************************************************************/
 
-menu_entry_t *menu_entry_create (const char *name, long command);
+menu_entry_t *menu_entry_new (const char *name, long command);
 void menu_entry_free (menu_entry_t * me);
 
-menu_t *create_menu (const char *name, GList * entries, const char *help_node);
+menu_t *menu_new (const char *name, GList * entries, const char *help_node);
 void menu_set_name (menu_t * menu, const char *name);
-void destroy_menu (menu_t * menu);
+void menu_free (menu_t * menu);
 
 WMenuBar *menubar_new (GList * menu);
 void menubar_set_menu (WMenuBar * menubar, GList * menu);
 void menubar_add_menu (WMenuBar * menubar, menu_t * menu);
 void menubar_arrange (WMenuBar * menubar);
 
-WMenuBar *find_menubar (const WDialog * h);
+WMenuBar *menubar_find (const WDialog * h);
 
 void menubar_activate (WMenuBar * menubar, gboolean dropped, int which);
 

lib/widget/mouse.c

@@ -40,6 +40,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/quick.c

@@ -59,6 +59,8 @@ typedef struct
     quick_widget_t *quick_widget;
 } quick_widget_item_t;
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/radio.c

@@ -49,6 +49,8 @@ const global_keymap_t *radio_map = NULL;
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* --------------------------------------------------------------------------------------------- */

lib/widget/widget-common.c

@@ -51,6 +51,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 /* maximum value of used widget ID */

lib/widget/wtools.c

@@ -50,6 +50,8 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
 static WDialog *last_query_dlg;
@@ -712,7 +714,7 @@ simple_status_msg_init_cb (status_msg_t * sm)
     wd_width = MAX (wd->rect.cols, b_width + 6);
 
     y = 2;
-    ssm->label = label_new (y++, 3, "");
+    ssm->label = label_new (y++, 3, NULL);
     group_add_widget_autopos (wg, ssm->label, WPOS_KEEP_TOP | WPOS_CENTER_HORZ, NULL);
     group_add_widget (wg, hline_new (y++, -1, -1));
     b = WIDGET (button_new (y++, 3, B_CANCEL, NORMAL_BUTTON, b_name, NULL));

m4.include/mc-get-fs-info.m4

@@ -3,11 +3,12 @@ dnl
 dnl posix_allocate() function detection
 dnl
 
-AC_DEFUN([gl_POSIX_FALLOCATE], [
+AC_DEFUN([POSIX_FALLOCATE], [
     dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[
         #define _XOPEN_SOURCE 600
         #include <stdlib.h>
+        #include <fcntl.h>
         #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
             possibly broken posix_fallocate
         #endif
@@ -115,7 +116,7 @@ AC_DEFUN([mc_GET_FS_INFO], [
     fi
     gl_FSTYPENAME
 
-    gl_POSIX_FALLOCATE
+    POSIX_FALLOCATE
 
     mc_cu_PREREQ_STAT_PROG
 ])

maint/templates/template.c

@@ -45,8 +45,11 @@
 
 /*** file scope type declarations ****************************************************************/
 
+/*** forward declarations (file scope functions) *************************************************/
+
 /*** file scope variables ************************************************************************/
 
+/* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 

po/af.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/mc/mc/language/af/)\n"
@@ -2156,9 +2156,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr ""
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3313,9 +3310,6 @@ msgstr ""
 msgid "Links:      %d"
 msgstr ""
 
-msgid "Attributes: not supported"
-msgstr ""
-
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
@@ -4216,18 +4210,18 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
-#, c-format
-msgid ""
-"Cannot open tar archive\n"
-"%s"
-msgstr ""
-
 msgid "Inconsistent tar archive"
 msgstr ""
 
 msgid "Unexpected EOF on archive file"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot open tar archive\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s\n"

po/ar.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic (http://www.transifex.com/mc/mc/language/ar/)\n"
@@ -2157,9 +2157,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr ""
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3326,9 +3323,6 @@ msgstr ""
 msgid "Links:      %d"
 msgstr ""
 
-msgid "Attributes: not supported"
-msgstr ""
-
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
@@ -4233,18 +4227,18 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
-#, c-format
-msgid ""
-"Cannot open tar archive\n"
-"%s"
-msgstr ""
-
 msgid "Inconsistent tar archive"
 msgstr ""
 
 msgid "Unexpected EOF on archive file"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot open tar archive\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s\n"

po/az.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Slava Zanko <slavazanko@gmail.com>, 2011\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/mc/mc/language/az/)\n"
@@ -2159,9 +2159,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr ""
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3316,9 +3313,6 @@ msgstr ""
 msgid "Links:      %d"
 msgstr ""
 
-msgid "Attributes: not supported"
-msgstr ""
-
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
@@ -4254,6 +4248,12 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
+msgid "Inconsistent tar archive"
+msgstr "Tar arxivi düzgün deyildir"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Arxiv faylında gözlənilməz EOF yaxalandı"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4262,12 +4262,6 @@ msgstr ""
 "%s\n"
 "tar arxivini aça bilmədim"
 
-msgid "Inconsistent tar archive"
-msgstr "Tar arxivi düzgün deyildir"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Arxiv faylında gözlənilməz EOF yaxalandı"
-
 #, c-format
 msgid ""
 "%s\n"

po/be.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Pavel Suravezhkin, 2022\n"
 "Language-Team: Belarusian (http://www.transifex.com/mc/mc/language/be/)\n"
@@ -2273,9 +2273,6 @@ msgstr ""
 "Немагчыма chattr \"%s\"\n"
 "%s"
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr "Немагчыма змяніць атрыбуты ў нелакальных файлавых сістэмах"
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3523,9 +3520,6 @@ msgstr "Уладальнік:      %s/%s"
 msgid "Links:      %d"
 msgstr "Спасылкі:      %d"
 
-msgid "Attributes: not supported"
-msgstr "Атрыбуты: не падтрымліваецца"
-
 #, c-format
 msgid "Attributes: %s"
 msgstr "Атрыбуты: %s"
@@ -4508,6 +4502,12 @@ msgstr "sftp: чытаецца спіс (спыніць — «Ctrl-G»)… %s"
 msgid "sftp: Listing done."
 msgstr "sftp: спіс прачытаны."
 
+msgid "Inconsistent tar archive"
+msgstr "Несумяшчальны архіў tar"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Нечаканы канец файла архіва"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4516,12 +4516,6 @@ msgstr ""
 "Немагчыма адкрыць архіў tar\n"
 "%s"
 
-msgid "Inconsistent tar archive"
-msgstr "Несумяшчальны архіў tar"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Нечаканы канец файла архіва"
-
 #, c-format
 msgid ""
 "%s\n"
@@ -4722,6 +4716,12 @@ msgstr "Працягваць ад пачатку?"
 msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
 msgstr "Немагчыма атрымаць лакальную копію /ftp://some.host/editme.txt"
 
+#~ msgid "Cannot change attributes on non-local filesystems"
+#~ msgstr "Немагчыма змяніць атрыбуты ў нелакальных файлавых сістэмах"
+
+#~ msgid "Attributes: not supported"
+#~ msgstr "Атрыбуты: не падтрымліваецца"
+
 #, c-format
 #~ msgid " %s%s file error"
 #~ msgstr " Памылка ў файле %s%s"

po/bg.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>, 2022\n"
 "Language-Team: Bulgarian (http://www.transifex.com/mc/mc/language/bg/)\n"
@@ -2272,9 +2272,6 @@ msgstr ""
 "Неуспешно изпълнение на chattr „%s“\n"
 "%s"
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr "Не може да се сменят атрибути на отдалечени ФС"
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3518,9 +3515,6 @@ msgstr "Притежател: %s/%s"
 msgid "Links:      %d"
 msgstr "Връзки: %d"
 
-msgid "Attributes: not supported"
-msgstr "Атрибути: не се поддържат"
-
 #, c-format
 msgid "Attributes: %s"
 msgstr "Атрибути: %s"
@@ -4502,6 +4496,12 @@ msgstr "sftp: (прекъсване с Ctrl-G) Извеждане… %s"
 msgid "sftp: Listing done."
 msgstr "sftp: Извеждането приключи."
 
+msgid "Inconsistent tar archive"
+msgstr "сгрешен архив tar"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Неочакван край на архива"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4510,12 +4510,6 @@ msgstr ""
 "Не може да се отвори архивът tar\n"
 "%s"
 
-msgid "Inconsistent tar archive"
-msgstr "сгрешен архив tar"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Неочакван край на архива"
-
 #, c-format
 msgid ""
 "%s\n"
@@ -4716,6 +4710,12 @@ msgstr "Да се продължи ли от началото?"
 msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
 msgstr "Не може да се изтегли локално копие на „/ftp://some.host/editme.txt“"
 
+#~ msgid "Cannot change attributes on non-local filesystems"
+#~ msgstr "Не може да се сменят атрибути на отдалечени ФС"
+
+#~ msgid "Attributes: not supported"
+#~ msgstr "Атрибути: не се поддържат"
+
 #, c-format
 #~ msgid " %s%s file error"
 #~ msgstr " %s%s файлова грешка"

po/br.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Irriep Nala Novram <allannkorh@yahoo.fr>, 2017-2018\n"
 "Language-Team: Breton (http://www.transifex.com/mc/mc/language/br/)\n"
@@ -2161,9 +2161,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr ""
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3327,9 +3324,6 @@ msgstr ""
 msgid "Links:      %d"
 msgstr ""
 
-msgid "Attributes: not supported"
-msgstr ""
-
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
@@ -4233,18 +4227,18 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
-#, c-format
-msgid ""
-"Cannot open tar archive\n"
-"%s"
-msgstr ""
-
 msgid "Inconsistent tar archive"
 msgstr ""
 
 msgid "Unexpected EOF on archive file"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot open tar archive\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s\n"

po/ca.po

@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>, 2017-2022\n"
 "Language-Team: Catalan (http://www.transifex.com/mc/mc/language/ca/)\n"
@@ -2283,9 +2283,6 @@ msgstr ""
 "No s'ha pogut fer chattr «%s»\n"
 "%s"
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr "No es poden canviar els atributs en sistemes de fitxers no locals"
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3529,9 +3526,6 @@ msgstr "Propietari: %s/%s"
 msgid "Links:      %d"
 msgstr "Enllaços:   %d"
 
-msgid "Attributes: not supported"
-msgstr "Atributs: no admesos"
-
 #, c-format
 msgid "Attributes: %s"
 msgstr "Atributs: %s"
@@ -4523,6 +4517,12 @@ msgstr "sftp: (Ctrl-G per a cancel·lar) s'està llistant... %s"
 msgid "sftp: Listing done."
 msgstr "sftp: el llistat s'ha completat."
 
+msgid "Inconsistent tar archive"
+msgstr "L'arxiu TAR no és coherent"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Fi de fitxer inesperat al fitxer d'arxiu"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4531,12 +4531,6 @@ msgstr ""
 "No s'ha pogut obrir l'arxiu TAR\n"
 "%s"
 
-msgid "Inconsistent tar archive"
-msgstr "L'arxiu TAR no és coherent"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Fi de fitxer inesperat al fitxer d'arxiu"
-
 #, c-format
 msgid ""
 "%s\n"
@@ -4739,6 +4733,12 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
 msgstr ""
 "No s'ha pogut obtenir una còpia local de /ftp://algun.amfitrió/editam.txt"
 
+#~ msgid "Cannot change attributes on non-local filesystems"
+#~ msgstr "No es poden canviar els atributs en sistemes de fitxers no locals"
+
+#~ msgid "Attributes: not supported"
+#~ msgstr "Atributs: no admesos"
+
 #, c-format
 #~ msgid " %s%s file error"
 #~ msgstr " error en el fitxer %s%s"

po/cs.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2017-2022\n"
 "Language-Team: Czech (http://www.transifex.com/mc/mc/language/cs/)\n"
@@ -2272,9 +2272,6 @@ msgstr ""
 "Není možné chattr „%s“\n"
 "%s"
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr "Není možné měnit atributy souborových systémů, které nejsou lokální"
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3533,9 +3530,6 @@ msgstr "Vlastník:      %s/%s"
 msgid "Links:      %d"
 msgstr "Odkazy:      %d"
 
-msgid "Attributes: not supported"
-msgstr "Atributy: nepodporováno"
-
 #, c-format
 msgid "Attributes: %s"
 msgstr "Atributy: %s"
@@ -4522,6 +4516,12 @@ msgstr "sftp: (přerušení CTRL+G) vypisování… %s"
 msgid "sftp: Listing done."
 msgstr "sftp: Vypsání dokončeno."
 
+msgid "Inconsistent tar archive"
+msgstr "Nekonzistentní archiv .tar"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Archivní soubor neočekávaně končí"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4530,12 +4530,6 @@ msgstr ""
 ".tar archiv se nedaří otevřít\n"
 "%s"
 
-msgid "Inconsistent tar archive"
-msgstr "Nekonzistentní archiv .tar"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Archivní soubor neočekávaně končí"
-
 #, c-format
 msgid ""
 "%s\n"
@@ -4736,6 +4730,12 @@ msgstr "Pokračovat od začátku?"
 msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
 msgstr "Nedaří získat místní kopii souboru /ftp://some.host/editme.txt"
 
+#~ msgid "Cannot change attributes on non-local filesystems"
+#~ msgstr "Není možné měnit atributy souborových systémů, které nejsou lokální"
+
+#~ msgid "Attributes: not supported"
+#~ msgstr "Atributy: nepodporováno"
+
 #, c-format
 #~ msgid " %s%s file error"
 #~ msgstr " %s%s chyba souboru"

po/da.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: scootergrisen, 2018-2020\n"
 "Language-Team: Danish (http://www.transifex.com/mc/mc/language/da/)\n"
@@ -2267,9 +2267,6 @@ msgstr ""
 "Kan ikke chattr \"%s\"\n"
 "%s"
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr "Kan ikke ændre attributter på filsystemer som ikke er lokale"
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3513,9 +3510,6 @@ msgstr "Ejer:       %s/%s"
 msgid "Links:      %d"
 msgstr "Henvisninger:      %d"
 
-msgid "Attributes: not supported"
-msgstr "Attributter: understøttes ikke"
-
 #, c-format
 msgid "Attributes: %s"
 msgstr "Attributter: %s"
@@ -4469,6 +4463,12 @@ msgstr "sftp: (Ctrl-G break) Liste... %s"
 msgid "sftp: Listing done."
 msgstr "sftp: Liste færdig."
 
+msgid "Inconsistent tar archive"
+msgstr "Inkonsistent tar-arkiv"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Uventet EOF i arkivfilen"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4477,12 +4477,6 @@ msgstr ""
 "Kunne ikke åbne tar-arkiv\n"
 "%s"
 
-msgid "Inconsistent tar archive"
-msgstr "Inkonsistent tar-arkiv"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Uventet EOF i arkivfilen"
-
 #, c-format
 msgid ""
 "%s\n"
@@ -4683,6 +4677,12 @@ msgstr "Fortsæt fra begyndelsen?"
 msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
 msgstr "Kan ikke hente en lokal kopi af /ftp://en.vært/editme.txt"
 
+#~ msgid "Cannot change attributes on non-local filesystems"
+#~ msgstr "Kan ikke ændre attributter på filsystemer som ikke er lokale"
+
+#~ msgid "Attributes: not supported"
+#~ msgstr "Attributter: understøttes ikke"
+
 #, c-format
 #~ msgid " %s%s file error"
 #~ msgstr " %s%s-filfejl"

po/de.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2015-2022\n"
 "Language-Team: German (http://www.transifex.com/mc/mc/language/de/)\n"
@@ -2282,9 +2282,6 @@ msgstr ""
 "Kann chattr für\"%s\" nicht durchführen\n"
 "%s"
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr "Kann Attribute auf nicht-lokalen Dateisystemen nicht ändern"
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3528,9 +3525,6 @@ msgstr "Eigentümer:      %s/%s"
 msgid "Links:      %d"
 msgstr "Links:      %d"
 
-msgid "Attributes: not supported"
-msgstr "Attribute: nicht unterstützt"
-
 #, c-format
 msgid "Attributes: %s"
 msgstr "Attribute: %s"
@@ -4504,6 +4498,12 @@ msgstr "sftp: Auflisten... %s (Strg+G zum Unterbrechen)"
 msgid "sftp: Listing done."
 msgstr "sftp: Auflisten beendet."
 
+msgid "Inconsistent tar archive"
+msgstr "Inkonsistentes tar-Archiv"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Unerwartetes Dateiende in Archivdatei"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4512,12 +4512,6 @@ msgstr ""
 "Kann tar-Archiv nicht öffnen\n"
 "%s"
 
-msgid "Inconsistent tar archive"
-msgstr "Inkonsistentes tar-Archiv"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Unerwartetes Dateiende in Archivdatei"
-
 #, c-format
 msgid ""
 "%s\n"
@@ -4718,6 +4712,12 @@ msgstr "Am Anfang fortsetzen?"
 msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
 msgstr "Kann lokale Kopie von /ftp://some.host/editme.txt nicht erstellen"
 
+#~ msgid "Cannot change attributes on non-local filesystems"
+#~ msgstr "Kann Attribute auf nicht-lokalen Dateisystemen nicht ändern"
+
+#~ msgid "Attributes: not supported"
+#~ msgstr "Attribute: nicht unterstützt"
+
 #, c-format
 #~ msgid " %s%s file error"
 #~ msgstr " Fehler in der Datei %s%s "

po/de_CH.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2015-02-26 09:48+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/"
@@ -2157,9 +2157,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr ""
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3314,9 +3311,6 @@ msgstr ""
 msgid "Links:      %d"
 msgstr ""
 
-msgid "Attributes: not supported"
-msgstr ""
-
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
@@ -4217,18 +4211,18 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
-#, c-format
-msgid ""
-"Cannot open tar archive\n"
-"%s"
-msgstr ""
-
 msgid "Inconsistent tar archive"
 msgstr ""
 
 msgid "Unexpected EOF on archive file"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot open tar archive\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s\n"

po/el.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2015\n"
 "Language-Team: Greek (http://www.transifex.com/mc/mc/language/el/)\n"
@@ -2189,9 +2189,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr ""
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3396,9 +3393,6 @@ msgstr ""
 msgid "Links:      %d"
 msgstr "Σύνδεσμοι:      %d"
 
-msgid "Attributes: not supported"
-msgstr ""
-
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
@@ -4330,6 +4324,12 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
+msgid "Inconsistent tar archive"
+msgstr "Χαλασμένη αρχειοθήκη tar"
+
+msgid "Unexpected EOF on archive file"
+msgstr "Απρόσμενο EOF στην αρχειοθήκη"
+
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
@@ -4338,12 +4338,6 @@ msgstr ""
 "Άνοιγμα αρχειοθήκης tar ανεπιτυχές\n"
 "%s"
 
-msgid "Inconsistent tar archive"
-msgstr "Χαλασμένη αρχειοθήκη tar"
-
-msgid "Unexpected EOF on archive file"
-msgstr "Απρόσμενο EOF στην αρχειοθήκη"
-
 #, c-format
 msgid ""
 "%s\n"

po/en_GB.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-01-29 11:16+0300\n"
+"POT-Creation-Date: 2023-03-19 20:39+0300\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2016-2017,2020,2022\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/mc/mc/"
@@ -2175,9 +2175,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Cannot change attributes on non-local filesystems"
-msgstr ""
-
 #, c-format
 msgid ""
 "Cannot get flags of \"%s\"\n"
@@ -3332,9 +3329,6 @@ msgstr ""
 msgid "Links:      %d"
 msgstr ""
 
-msgid "Attributes: not supported"
-msgstr ""
-
 #, c-format
 msgid "Attributes: %s"
 msgstr ""
@@ -4235,18 +4229,18 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
-#, c-format
-msgid ""
-"Cannot open tar archive\n"
-"%s"
-msgstr ""
-
 msgid "Inconsistent tar archive"
 msgstr ""
 
 msgid "Unexpected EOF on archive file"
 msgstr ""
 
+#, c-format
+msgid ""
+"Cannot open tar archive\n"
+"%s"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s\n"