mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

(regex_command_for): move load of extension file to separate function.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2022-07-23 20:16:40 +03:00
parent cf660c7f9d
commit 1cb66b82bd
1 changed files with 75 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
src/filemanager/ext.c
View File

@ -759,6 +759,79 @@ regex_check_type (const vfs_path_t * filename_vpath, const char *ptr, gboolean c
}
#endif /* USE_FILE_CMD */
/* --------------------------------------------------------------------------------------------- */
static gboolean
load_extension_file (void)
{
char *extension_file;
gboolean mc_user_ext = TRUE;
gboolean home_error = FALSE;
extension_file = mc_config_get_full_path (MC_EXT_FILE);
if (!exist_file (extension_file))
{
g_free (extension_file);
check_stock_mc_ext:
extension_file = mc_build_filename (mc_global.sysconfig_dir, MC_EXT_FILE, (char *) NULL);
if (!exist_file (extension_file))
{
g_free (extension_file);
extension_file =
mc_build_filename (mc_global.share_data_dir, MC_EXT_FILE, (char *) NULL);
}
mc_user_ext = FALSE;
}
g_file_get_contents (extension_file, &data, NULL, NULL);
g_free (extension_file);
if (data == NULL)
return FALSE;
if (strstr (data, "default/") == NULL)
{
if (strstr (data, "regex/") == NULL && strstr (data, "shell/") == NULL &&
strstr (data, "type/") == NULL)
{
MC_PTR_FREE (data);
if (!mc_user_ext)
{
char *title;
title =
g_strdup_printf (_(" %s%s file error"), mc_global.sysconfig_dir, MC_EXT_FILE);
message (D_ERROR, title,
_("The format of the %s%s file has changed with version 3.0. "
"It seems that the installation failed. Please fetch a fresh copy "
"from the Midnight Commander package."),
mc_global.sysconfig_dir, MC_EXT_FILE);
g_free (title);
return FALSE;
}
home_error = TRUE;
goto check_stock_mc_ext;
}
}
if (home_error)
{
char *title;
extension_file = mc_config_get_full_path (MC_EXT_FILE);
title = g_strdup_printf (_("%s file error"), extension_file);
message (D_ERROR, title,
_("The format of the %s file has changed with version 3.0. You may either want "
"to copy it from %s%s or use that file as an example of how to write it."),
extension_file, mc_global.sysconfig_dir, MC_EXT_FILE);
g_free (extension_file);
g_free (title);
}
return TRUE;
}
/* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
@ -815,76 +888,9 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
action = "View";
}
if (data == NULL)
{
char *extension_file;
gboolean mc_user_ext = TRUE;
gboolean home_error = FALSE;
extension_file = mc_config_get_full_path (MC_EXT_FILE);
if (!exist_file (extension_file))
{
g_free (extension_file);
check_stock_mc_ext:
extension_file =
mc_build_filename (mc_global.sysconfig_dir, MC_EXT_FILE, (char *) NULL);
if (!exist_file (extension_file))
{
g_free (extension_file);
extension_file =
mc_build_filename (mc_global.share_data_dir, MC_EXT_FILE, (char *) NULL);
}
mc_user_ext = FALSE;
}
g_file_get_contents (extension_file, &data, NULL, NULL);
g_free (extension_file);
if (data == NULL)
if (data == NULL && !load_extension_file ())
return 0;
if (strstr (data, "default/") == NULL)
{
if (strstr (data, "regex/") == NULL && strstr (data, "shell/") == NULL &&
strstr (data, "type/") == NULL)
{
MC_PTR_FREE (data);
if (!mc_user_ext)
{
char *title;
title = g_strdup_printf (_(" %s%s file error"),
mc_global.sysconfig_dir, MC_EXT_FILE);
message (D_ERROR, title, _("The format of the %s%s file has changed with "
"version 3.0. It seems that the installation failed. "
"Please fetch a fresh copy from the "
"Midnight Commander package."),
mc_global.sysconfig_dir, MC_EXT_FILE);
g_free (title);
return 0;
}
home_error = TRUE;
goto check_stock_mc_ext;
}
}
if (home_error)
{
char *title;
extension_file = mc_config_get_full_path (MC_EXT_FILE);
title = g_strdup_printf (_("%s file error"), extension_file);
message (D_ERROR, title,
_("The format of the %s file has changed with version 3.0. "
"You may either want to copy it from %s%s or use that file "
"as an example of how to write it."),
extension_file, mc_global.sysconfig_dir, MC_EXT_FILE);
g_free (extension_file);
g_free (title);
}
}
mc_stat (filename_vpath, &mystat);
filename = vfs_path_get_last_path_str (filename_vpath);