ports/mc
ports/mc
1
1
Форкнуть 0
Код Релизы 2 Активность

Merge branch '2203_vfs_encodings'

Просмотр исходного кода 
* 2203_vfs_encodings:
  Applied MC indentation policy.
  Fixed build with --disable-charset option. Minor optimization.
  Ticket #2203: VFS: use codepage list loaded from mc.charsets file.
Этот коммит содержится в:
Andrew Borodin 2010-05-28 14:58:48 +04:00
родитель 0ea12cdec6 2c15a595c1
Коммит 159927cb2c
2 изменённых файлов: 534 добавлений и 458 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

65
lib/vfs/mc-vfs/vfs.c
Просмотреть файл

@ -52,6 +52,9 @@
#include "lib/global.h" #include "lib/global.h"
#include "lib/strutil.h" #include "lib/strutil.h"
#ifdef HAVE_CHARSET
#include "src/charsets.h"
#endif
#include "src/wtools.h" /* message() */ #include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */ #include "src/main.h" /* print_vfs_message */
@ -96,21 +99,6 @@ static long vfs_free_handle_list = -1;
static struct vfs_class *localfs_class; static struct vfs_class *localfs_class;
static GString *vfs_str_buffer; static GString *vfs_str_buffer;
static const char *supported_encodings[] = {
"UTF8",
"UTF-8",
"BIG5",
"ASCII",
"ISO8859",
"ISO-8859",
"ISO_8859",
"KOI8",
"CP852",
"CP866",
"CP125",
NULL
};
/** Create new VFS handle and put it to the list */ /** Create new VFS handle and put it to the list */
static int static int
vfs_new_handle (struct vfs_class *vclass, void *fsinfo) vfs_new_handle (struct vfs_class *vclass, void *fsinfo)
@ -404,17 +392,18 @@ vfs_get_encoding (const char *path)
/* return if encoding can by used in vfs (is ascci full compactible) */ /* return if encoding can by used in vfs (is ascci full compactible) */
/* contains only a few encoding now */ /* contains only a few encoding now */
static int static gboolean
vfs_supported_enconding (const char *encoding) vfs_supported_enconding (const char *encoding)
{ {
int t; gboolean result = FALSE;
int result = 0;
for (t = 0; supported_encodings[t] != NULL; t++) #ifdef HAVE_CHARSET
{ int t;
result += (g_ascii_strncasecmp (encoding, supported_encodings[t],
strlen (supported_encodings[t])) == 0); for (t = 0; t < n_codepages; t++)
} result |= (g_ascii_strncasecmp (encoding, codepages[t].id,
strlen (codepages[t].id)) == 0);
#endif
return result; return result;
} }
@ -434,18 +423,20 @@ _vfs_translate_path (const char *path, int size, GIConv defcnv, GString * buffer
const char *ps; const char *ps;
const char *slash; const char *slash;
estr_t state = ESTR_SUCCESS; estr_t state = ESTR_SUCCESS;
static char encoding[16];
GIConv coder;
int ms;
if (size == 0) if (size == 0)
return 0; return ESTR_SUCCESS;
size = (size > 0) ? size : (signed int) strlen (path); size = (size > 0) ? size : (signed int) strlen (path);
/* try found #end: */ /* try found #end: */
semi = g_strrstr_len (path, size, "#enc:"); semi = g_strrstr_len (path, size, "#enc:");
if (semi != NULL) if (semi != NULL)
{ {
char encoding[16];
GIConv coder = INVALID_CONV;
int ms;
/* first must be translated part before #enc: */ /* first must be translated part before #enc: */
ms = semi - path; ms = semi - path;
@ -474,16 +465,13 @@ _vfs_translate_path (const char *path, int size, GIConv defcnv, GString * buffer
memcpy (encoding, semi, ms); memcpy (encoding, semi, ms);
encoding[ms] = '\0'; encoding[ms] = '\0';
switch (vfs_supported_enconding (encoding)) if (vfs_supported_enconding (encoding))
{
case 1:
coder = str_crt_conv_to (encoding); coder = str_crt_conv_to (encoding);
if (coder != INVALID_CONV) if (coder != INVALID_CONV)
{ {
if (slash != NULL) if (slash != NULL)
{
state = str_vfs_convert_to (coder, slash, path + size - slash, buffer); state = str_vfs_convert_to (coder, slash, path + size - slash, buffer);
}
else if (buffer->str[0] == '\0') else if (buffer->str[0] == '\0')
{ {
/* exmaple "/#enc:utf-8" */ /* exmaple "/#enc:utf-8" */
@ -492,24 +480,17 @@ _vfs_translate_path (const char *path, int size, GIConv defcnv, GString * buffer
str_close_conv (coder); str_close_conv (coder);
return state; return state;
} }
else
{
errno = EINVAL; errno = EINVAL;
return ESTR_FAILURE; state = ESTR_FAILURE;
}
default:
errno = EINVAL;
return ESTR_FAILURE;
}
} }
else else
{ {
/* path can be translated whole at once */ /* path can be translated whole at once */
state = str_vfs_convert_to (defcnv, path, size, buffer); state = str_vfs_convert_to (defcnv, path, size, buffer);
return state;
} }
return ESTR_SUCCESS; return state;
} }
char * char *

293
src/ext.c
Просмотреть файл

@ -48,8 +48,10 @@
#include "execute.h" #include "execute.h"
#include "history.h" #include "history.h"
#include "layout.h" #include "layout.h"
#ifdef HAVE_CHARSET
#include "charsets.h" /* get_codepage_index */ #include "charsets.h" /* get_codepage_index */
#include "selcodepage.h" /* do_set_codepage */ #include "selcodepage.h" /* do_set_codepage */
#endif
#include "ext.h" #include "ext.h"
/* If set, we execute the file command to check the file type */ /* If set, we execute the file command to check the file type */
@ -71,8 +73,7 @@ flush_extension_file (void)
typedef char *(*quote_func_t) (const char *name, int quote_percent); typedef char *(*quote_func_t) (const char *name, int quote_percent);
static void static void
exec_extension (const char *filename, const char *lc_data, int *move_dir, exec_extension (const char *filename, const char *lc_data, int *move_dir, int start_line)
int start_line)
{ {
char *fn; char *fn;
char *file_name; char *file_name;
@ -112,10 +113,10 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
*/ */
cmd_file_fd = mc_mkstemps (&file_name, "mcext", SCRIPT_SUFFIX); cmd_file_fd = mc_mkstemps (&file_name, "mcext", SCRIPT_SUFFIX);
if (cmd_file_fd == -1) { if (cmd_file_fd == -1)
{
message (D_ERROR, MSG_ERROR, message (D_ERROR, MSG_ERROR,
_(" Cannot create temporary command file \n %s "), _(" Cannot create temporary command file \n %s "), unix_error_string (errno));
unix_error_string (errno));
return; return;
} }
@ -123,18 +124,24 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
fputs ("#! /bin/sh\n", cmd_file); fputs ("#! /bin/sh\n", cmd_file);
lc_prompt[0] = '\0'; lc_prompt[0] = '\0';
for (; *lc_data != '\0' && *lc_data != '\n'; lc_data++) { for (; *lc_data != '\0' && *lc_data != '\n'; lc_data++)
if (parameter_found) { {
if (*lc_data == '}') { if (parameter_found)
{
if (*lc_data == '}')
{
char *parameter; char *parameter;
parameter_found = 0; parameter_found = 0;
parameter = input_dialog (_(" Parameter "), lc_prompt, MC_HISTORY_EXT_PARAMETER, ""); parameter =
if (parameter == NULL) { input_dialog (_(" Parameter "), lc_prompt, MC_HISTORY_EXT_PARAMETER, "");
if (parameter == NULL)
{
/* User canceled */ /* User canceled */
fclose (cmd_file); fclose (cmd_file);
unlink (file_name); unlink (file_name);
if (localcopy) { if (localcopy)
{
mc_ungetlocalcopy (filename, localcopy, 0); mc_ungetlocalcopy (filename, localcopy, 0);
g_free (localcopy); g_free (localcopy);
} }
@ -144,49 +151,67 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
fputs (parameter, cmd_file); fputs (parameter, cmd_file);
written_nonspace = 1; written_nonspace = 1;
g_free (parameter); g_free (parameter);
} else { }
else
{
size_t len = strlen (lc_prompt); size_t len = strlen (lc_prompt);
if (len < sizeof (lc_prompt) - 1) { if (len < sizeof (lc_prompt) - 1)
{
lc_prompt[len] = *lc_data; lc_prompt[len] = *lc_data;
lc_prompt[len + 1] = '\0'; lc_prompt[len + 1] = '\0';
} }
} }
} else if (expand_prefix_found) { }
else if (expand_prefix_found)
{
expand_prefix_found = 0; expand_prefix_found = 0;
if (*lc_data == '{') if (*lc_data == '{')
parameter_found = 1; parameter_found = 1;
else { else
{
int i; int i;
char *v; char *v;
i = check_format_view (lc_data); i = check_format_view (lc_data);
if (i != 0) { if (i != 0)
{
lc_data += i - 1; lc_data += i - 1;
run_view = 1; run_view = 1;
} else { }
else
{
i = check_format_cd (lc_data); i = check_format_cd (lc_data);
if (i > 0) { if (i > 0)
{
is_cd = 1; is_cd = 1;
quote_func = fake_name_quote; quote_func = fake_name_quote;
do_local_copy = 0; do_local_copy = 0;
p = buffer; p = buffer;
lc_data += i - 1; lc_data += i - 1;
} else { }
else
{
i = check_format_var (lc_data, &v); i = check_format_var (lc_data, &v);
if (i > 0 && v != NULL) { if (i > 0 && v != NULL)
{
fputs (v, cmd_file); fputs (v, cmd_file);
g_free (v); g_free (v);
lc_data += i; lc_data += i;
} else { }
else
{
char *text; char *text;
if (*lc_data != 'f') if (*lc_data != 'f')
text = expand_format (NULL, *lc_data, !is_cd); text = expand_format (NULL, *lc_data, !is_cd);
else { else
if (do_local_copy) { {
if (do_local_copy)
{
localcopy = mc_getlocalcopy (filename); localcopy = mc_getlocalcopy (filename);
if (localcopy == NULL) { if (localcopy == NULL)
{
fclose (cmd_file); fclose (cmd_file);
unlink (file_name); unlink (file_name);
g_free (file_name); g_free (file_name);
@ -195,7 +220,9 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
mc_stat (localcopy, &mystat); mc_stat (localcopy, &mystat);
localmtime = mystat.st_mtime; localmtime = mystat.st_mtime;
text = quote_func (localcopy, 0); text = quote_func (localcopy, 0);
} else { }
else
{
fn = vfs_canon_and_translate (filename); fn = vfs_canon_and_translate (filename);
text = quote_func (fn, 0); text = quote_func (fn, 0);
g_free (fn); g_free (fn);
@ -204,7 +231,8 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
if (!is_cd) if (!is_cd)
fputs (text, cmd_file); fputs (text, cmd_file);
else { else
{
strcpy (p, text); strcpy (p, text);
p = strchr (p, 0); p = strchr (p, 0);
} }
@ -215,9 +243,11 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
} }
} }
} }
} else if (*lc_data == '%') }
else if (*lc_data == '%')
expand_prefix_found = 1; expand_prefix_found = 1;
else { else
{
if (*lc_data != ' ' && *lc_data != '\t') if (*lc_data != ' ' && *lc_data != '\t')
written_nonspace = 1; written_nonspace = 1;
if (is_cd) if (is_cd)
@ -237,18 +267,22 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
fclose (cmd_file); fclose (cmd_file);
if ((run_view && !written_nonspace) || is_cd) { if ((run_view && !written_nonspace) || is_cd)
{
unlink (file_name); unlink (file_name);
g_free (file_name); g_free (file_name);
file_name = NULL; file_name = NULL;
} else { }
else
{
/* Set executable flag on the command file ... */ /* Set executable flag on the command file ... */
chmod (file_name, S_IRWXU); chmod (file_name, S_IRWXU);
/* ... but don't rely on it - run /bin/sh explicitly */ /* ... but don't rely on it - run /bin/sh explicitly */
cmd = g_strconcat ("/bin/sh ", file_name, (char *) NULL); cmd = g_strconcat ("/bin/sh ", file_name, (char *) NULL);
} }
if (run_view) { if (run_view)
{
mcview_altered_hex_mode = 0; mcview_altered_hex_mode = 0;
mcview_altered_nroff_flag = 0; mcview_altered_nroff_flag = 0;
if (def_hex_mode != mcview_default_hex_mode) if (def_hex_mode != mcview_default_hex_mode)
@ -259,10 +293,13 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
/* If we've written whitespace only, then just load filename /* If we've written whitespace only, then just load filename
* into view * into view
*/ */
if (written_nonspace) { if (written_nonspace)
{
mcview_viewer (cmd, filename, move_dir, start_line); mcview_viewer (cmd, filename, move_dir, start_line);
unlink (file_name); unlink (file_name);
} else { }
else
{
mcview_viewer (NULL, filename, move_dir, start_line); mcview_viewer (NULL, filename, move_dir, start_line);
} }
if (changed_hex_mode && !mcview_altered_hex_mode) if (changed_hex_mode && !mcview_altered_hex_mode)
@ -270,7 +307,9 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
if (changed_nroff_flag && !mcview_altered_nroff_flag) if (changed_nroff_flag && !mcview_altered_nroff_flag)
mcview_default_nroff_flag = def_nroff_flag; mcview_default_nroff_flag = def_nroff_flag;
repaint_screen (); repaint_screen ();
} else if (is_cd) { }
else if (is_cd)
{
char *q; char *q;
*p = 0; *p = 0;
p = buffer; p = buffer;
@ -284,15 +323,18 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
q--; q--;
q[1] = 0; q[1] = 0;
do_cd (p, cd_parse_command); do_cd (p, cd_parse_command);
} else { }
else
{
shell_execute (cmd, EXECUTE_INTERNAL); shell_execute (cmd, EXECUTE_INTERNAL);
if (console_flag) { if (console_flag)
{
handle_console (CONSOLE_SAVE); handle_console (CONSOLE_SAVE);
if (output_lines && keybar_visible) { if (output_lines && keybar_visible)
{
show_console_contents (output_start_y, show_console_contents (output_start_y,
LINES - keybar_visible - LINES - keybar_visible -
output_lines - 1, output_lines - 1, LINES - keybar_visible - 1);
LINES - keybar_visible - 1);
} }
} }
} }
@ -300,10 +342,10 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir,
g_free (file_name); g_free (file_name);
g_free (cmd); g_free (cmd);
if (localcopy) { if (localcopy)
{
mc_stat (localcopy, &mystat); mc_stat (localcopy, &mystat);
mc_ungetlocalcopy (filename, localcopy, mc_ungetlocalcopy (filename, localcopy, localmtime != mystat.st_mtime);
localmtime != mystat.st_mtime);
g_free (localcopy); g_free (localcopy);
} }
} }
@ -332,9 +374,11 @@ get_popen_information (const char *cmd_file, const char *args, char *buf, int bu
f = popen (command, "r"); f = popen (command, "r");
g_free (command); g_free (command);
if (f != NULL) { if (f != NULL)
{
#ifdef __QNXNTO__ #ifdef __QNXNTO__
if (setvbuf (f, NULL, _IOFBF, 0) != 0) { if (setvbuf (f, NULL, _IOFBF, 0) != 0)
{
(void) pclose (f); (void) pclose (f);
return -1; return -1;
} }
@ -343,7 +387,9 @@ get_popen_information (const char *cmd_file, const char *args, char *buf, int bu
if (!read_bytes) if (!read_bytes)
buf[0] = '\0'; /* Paranoid termination */ buf[0] = '\0'; /* Paranoid termination */
pclose (f); pclose (f);
} else { }
else
{
buf[0] = '\0'; /* Paranoid termination */ buf[0] = '\0'; /* Paranoid termination */
return -1; return -1;
} }
@ -370,6 +416,7 @@ get_file_type_local (const char *filename, char *buf, int buflen)
return ret; return ret;
} }
#ifdef HAVE_CHARSET
/* /*
* Run the "enca" command on the local file. * Run the "enca" command on the local file.
* Return 1 if the data is valid, 0 otherwise, -1 for fatal errors. * Return 1 if the data is valid, 0 otherwise, -1 for fatal errors.
@ -392,6 +439,7 @@ get_file_encoding_local (const char *filename, char *buf, int buflen)
return ret; return ret;
} }
#endif /* HAVE_CHARSET */
/* /*
* Invoke the "file" command on the file and match its output against PTR. * Invoke the "file" command on the file and match its output against PTR.
@ -413,10 +461,14 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
if (!use_file_to_check_type) if (!use_file_to_check_type)
return 0; return 0;
if (*have_type == 0) { if (*have_type == 0)
{
char *realname; /* name used with "file" */ char *realname; /* name used with "file" */
char *localfile; char *localfile;
#ifdef HAVE_CHARSET
int got_encoding_data; int got_encoding_data;
#endif /* HAVE_CHARSET */
/* Don't repeate even unsuccessful checks */ /* Don't repeate even unsuccessful checks */
*have_type = 1; *have_type = 1;
@ -427,13 +479,12 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
realname = localfile; realname = localfile;
#ifdef HAVE_CHARSET
got_encoding_data = is_autodetect_codeset_enabled got_encoding_data = is_autodetect_codeset_enabled
? get_file_encoding_local (localfile, encoding_id, sizeof (encoding_id)) ? get_file_encoding_local (localfile, encoding_id, sizeof (encoding_id)) : 0;
: 0;
mc_ungetlocalcopy (filename, localfile, 0); if (got_encoding_data > 0)
{
if (got_encoding_data > 0) {
char *pp; char *pp;
int cp_id; int cp_id;
@ -447,29 +498,39 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
do_set_codepage (cp_id); do_set_codepage (cp_id);
} }
#endif /* HAVE_CHARSET */
mc_ungetlocalcopy (filename, localfile, 0);
got_data = get_file_type_local (localfile, content_string, sizeof (content_string)); got_data = get_file_type_local (localfile, content_string, sizeof (content_string));
if (got_data > 0) { if (got_data > 0)
{
char *pp; char *pp;
size_t real_len;
pp = strchr (content_string, '\n'); pp = strchr (content_string, '\n');
if (pp != NULL) if (pp != NULL)
*pp = '\0'; *pp = '\0';
if (strncmp (content_string, realname, strlen (realname)) == 0) { real_len = strlen (realname);
if (strncmp (content_string, realname, real_len) == 0)
{
/* Skip "realname: " */ /* Skip "realname: " */
content_shift = strlen (realname); content_shift = real_len;
if (content_string[content_shift] == ':') { if (content_string[content_shift] == ':')
{
/* Solaris' file prints tab(s) after ':' */ /* Solaris' file prints tab(s) after ':' */
for (content_shift++; for (content_shift++;
content_string[content_shift] == ' ' content_string[content_shift] == ' '
|| content_string[content_shift] == '\t'; || content_string[content_shift] == '\t'; content_shift++)
content_shift++)
; ;
} }
} }
} else { }
else
{
/* No data */ /* No data */
content_string[0] = '\0'; content_string[0] = '\0';
} }
@ -480,7 +541,8 @@ regex_check_type (const char *filename, const char *ptr, int *have_type)
return -1; return -1;
if (content_string[0] != '\0' if (content_string[0] != '\0'
&& mc_search (ptr, content_string + content_shift, MC_SEARCH_T_REGEX)) { && mc_search (ptr, content_string + content_shift, MC_SEARCH_T_REGEX))
{
found = 1; found = 1;
} }
@ -514,24 +576,30 @@ regex_command (const char *filename, const char *action, int *move_dir)
int have_type = 0; /* Flag used by regex_check_type() */ int have_type = 0; /* Flag used by regex_check_type() */
/* Check for the special View:%d parameter */ /* Check for the special View:%d parameter */
if (strncmp (action, "View:", 5) == 0) { if (strncmp (action, "View:", 5) == 0)
{
view_at_line_number = atoi (action + 5); view_at_line_number = atoi (action + 5);
action = "View"; action = "View";
} else { }
else
{
view_at_line_number = 0; view_at_line_number = 0;
} }
if (data == NULL) { if (data == NULL)
{
char *extension_file; char *extension_file;
int mc_user_ext = 1; int mc_user_ext = 1;
int home_error = 0; int home_error = 0;
extension_file = g_build_filename (home_dir, MC_USERCONF_DIR, MC_FILEBIND_FILE, NULL); extension_file = g_build_filename (home_dir, MC_USERCONF_DIR, MC_FILEBIND_FILE, NULL);
if (!exist_file (extension_file)) { if (!exist_file (extension_file))
{
g_free (extension_file); g_free (extension_file);
check_stock_mc_ext: check_stock_mc_ext:
extension_file = concat_dir_and_file (mc_home, MC_LIB_EXT); extension_file = concat_dir_and_file (mc_home, MC_LIB_EXT);
if (!exist_file (extension_file)) { if (!exist_file (extension_file))
{
g_free (extension_file); g_free (extension_file);
extension_file = concat_dir_and_file (mc_home_alt, MC_LIB_EXT); extension_file = concat_dir_and_file (mc_home_alt, MC_LIB_EXT);
} }
@ -542,17 +610,20 @@ regex_command (const char *filename, const char *action, int *move_dir)
if (data == NULL) if (data == NULL)
return 0; return 0;
if (!strstr (data, "default/")) { if (!strstr (data, "default/"))
if (!strstr (data, "regex/") && !strstr (data, "shell/") {
&& !strstr (data, "type/")) { if (!strstr (data, "regex/") && !strstr (data, "shell/") && !strstr (data, "type/"))
{
g_free (data); g_free (data);
data = NULL; data = NULL;
if (mc_user_ext) { if (mc_user_ext)
{
home_error = 1; home_error = 1;
goto check_stock_mc_ext; goto check_stock_mc_ext;
} else { }
char *title = else
g_strdup_printf (_(" %s%s file error"), {
char *title = g_strdup_printf (_(" %s%s file error"),
mc_home, MC_LIB_EXT); mc_home, MC_LIB_EXT);
message (D_ERROR, title, _("The format of the %smc.ext " message (D_ERROR, title, _("The format of the %smc.ext "
"file has changed with version 3.0. It seems that " "file has changed with version 3.0. It seems that "
@ -564,13 +635,16 @@ regex_command (const char *filename, const char *action, int *move_dir)
} }
} }
} }
if (home_error) { if (home_error)
{
char *title = char *title =
g_strdup_printf (_(" ~/%s file error "), MC_USERCONF_DIR PATH_SEP_STR MC_FILEBIND_FILE); g_strdup_printf (_(" ~/%s file error "),
message (D_ERROR, title, _("The format of the ~/%s file has " MC_USERCONF_DIR PATH_SEP_STR MC_FILEBIND_FILE);
message (D_ERROR, title,
_("The format of the ~/%s file has "
"changed with version 3.0. You may either want to copy " "changed with version 3.0. You may either want to copy "
"it from %smc.ext or use that file as an example of how " "it from %smc.ext or use that file as an example of how " "to write it."),
"to write it."), MC_USERCONF_DIR PATH_SEP_STR MC_FILEBIND_FILE, mc_home); MC_USERCONF_DIR PATH_SEP_STR MC_FILEBIND_FILE, mc_home);
g_free (title); g_free (title);
} }
} }
@ -578,7 +652,8 @@ regex_command (const char *filename, const char *action, int *move_dir)
include_target = NULL; include_target = NULL;
include_target_len = 0; include_target_len = 0;
for (p = data; *p; p++) { for (p = data; *p; p++)
{
for (q = p; *q == ' ' || *q == '\t'; q++); for (q = p; *q == ' ' || *q == '\t'; q++);
if (*q == '\n' || !*q) if (*q == '\n' || !*q)
p = q; /* empty line */ p = q; /* empty line */
@ -589,7 +664,8 @@ regex_command (const char *filename, const char *action, int *move_dir)
continue; continue;
if (!*p) if (!*p)
break; break;
if (p == q) { /* i.e. starts in the first column, should be if (p == q)
{ /* i.e. starts in the first column, should be
* keyword/descNL * keyword/descNL
*/ */
found = 0; found = 0;
@ -598,32 +674,42 @@ regex_command (const char *filename, const char *action, int *move_dir)
q = strchr (p, 0); q = strchr (p, 0);
c = *q; c = *q;
*q = 0; *q = 0;
if (include_target) { if (include_target)
{
if ((strncmp (p, "include/", 8) == 0) if ((strncmp (p, "include/", 8) == 0)
&& (strncmp (p + 8, include_target, include_target_len) && (strncmp (p + 8, include_target, include_target_len) == 0))
== 0))
found = 1; found = 1;
} else if (!strncmp (p, "regex/", 6)) { }
else if (!strncmp (p, "regex/", 6))
{
p += 6; p += 6;
/* Do not transform shell patterns, you can use shell/ for /* Do not transform shell patterns, you can use shell/ for
* that * that
*/ */
if (mc_search (p, filename, MC_SEARCH_T_REGEX)) if (mc_search (p, filename, MC_SEARCH_T_REGEX))
found = 1; found = 1;
} else if (!strncmp (p, "directory/", 10)) { }
if (S_ISDIR (mystat.st_mode) else if (!strncmp (p, "directory/", 10))
&& mc_search (p + 10, filename, MC_SEARCH_T_REGEX)) {
if (S_ISDIR (mystat.st_mode) && mc_search (p + 10, filename, MC_SEARCH_T_REGEX))
found = 1; found = 1;
} else if (!strncmp (p, "shell/", 6)) { }
else if (!strncmp (p, "shell/", 6))
{
p += 6; p += 6;
if (*p == '.' && file_len >= (q - p)) { if (*p == '.' && file_len >= (q - p))
{
if (!strncmp (p, filename + file_len - (q - p), q - p)) if (!strncmp (p, filename + file_len - (q - p), q - p))
found = 1; found = 1;
} else { }
else
{
if (q - p == file_len && !strncmp (p, filename, q - p)) if (q - p == file_len && !strncmp (p, filename, q - p))
found = 1; found = 1;
} }
} else if (!strncmp (p, "type/", 5)) { }
else if (!strncmp (p, "type/", 5))
{
int res; int res;
p += 5; p += 5;
res = regex_check_type (filename, p, &have_type); res = regex_check_type (filename, p, &have_type);
@ -631,24 +717,31 @@ regex_command (const char *filename, const char *action, int *move_dir)
found = 1; found = 1;
if (res == -1) if (res == -1)
error_flag = 1; /* leave it if file cannot be opened */ error_flag = 1; /* leave it if file cannot be opened */
} else if (!strncmp (p, "default/", 8)) { }
else if (!strncmp (p, "default/", 8))
{
found = 1; found = 1;
} }
*q = c; *q = c;
p = q; p = q;
if (!*p) if (!*p)
break; break;
} else { /* List of actions */ }
else
{ /* List of actions */
p = q; p = q;
q = strchr (p, '\n'); q = strchr (p, '\n');
if (q == NULL) if (q == NULL)
q = strchr (p, 0); q = strchr (p, 0);
if (found && !error_flag) { if (found && !error_flag)
{
r = strchr (p, '='); r = strchr (p, '=');
if (r != NULL) { if (r != NULL)
{
c = *r; c = *r;
*r = 0; *r = 0;
if (strcmp (p, "Include") == 0) { if (strcmp (p, "Include") == 0)
{
char *t; char *t;
include_target = p + 8; include_target = p + 8;
@ -667,7 +760,8 @@ regex_command (const char *filename, const char *action, int *move_dir)
break; break;
continue; continue;
} }
if (!strcmp (action, p)) { if (!strcmp (action, p))
{
*r = c; *r = c;
for (p = r + 1; *p == ' ' || *p == '\t'; p++); for (p = r + 1; *p == ' ' || *p == '\t'; p++);
@ -679,17 +773,18 @@ regex_command (const char *filename, const char *action, int *move_dir)
* filename parameter invalid (ie, most of the time, * filename parameter invalid (ie, most of the time,
* we get filename as a pointer from current_panel->dir). * we get filename as a pointer from current_panel->dir).
*/ */
if (p < q) { if (p < q)
{
char *filename_copy = g_strdup (filename); char *filename_copy = g_strdup (filename);
exec_extension (filename_copy, r + 1, move_dir, exec_extension (filename_copy, r + 1, move_dir, view_at_line_number);
view_at_line_number);
g_free (filename_copy); g_free (filename_copy);
ret = 1; ret = 1;
} }
break; break;
} else }
else
*r = c; *r = c;
} }
} }