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): new function to use regex_command in already created viewer/editor

Browse Source 
...and related changes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-03-24 13:40:36 +04:00
parent bd8ad7e94b
commit 4d0f17e79a
2 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/filemanager/ext.c
View File

@ -98,9 +98,22 @@ static gboolean is_cd = FALSE;
static gboolean written_nonspace = FALSE;
static gboolean do_local_copy = FALSE;
/* --------------------------------------------------------------------------------------------- */
/*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
static void
exec_cleanup_script (vfs_path_t * script_vpath)
{
if (script_vpath != NULL)
{
(void) mc_unlink (script_vpath);
vfs_path_free (script_vpath);
}
}
/* --------------------------------------------------------------------------------------------- */
static void
exec_cleanup_file_name (const vfs_path_t * filename_vpath, gboolean has_changed)
{
@ -142,6 +155,7 @@ exec_get_file_name (const vfs_path_t * filename_vpath)
}
/* --------------------------------------------------------------------------------------------- */
static char *
exec_expand_format (char symbol, gboolean is_result_quoted)
{
@ -337,11 +351,13 @@ exec_make_shell_string (const char *lc_data, const vfs_path_t * filename_vpath)
/* --------------------------------------------------------------------------------------------- */
static void
exec_extension_view (char *cmd, const vfs_path_t * filename_vpath, int start_line)
exec_extension_view (void *target, char *cmd, const vfs_path_t * filename_vpath, int start_line)
{
int def_hex_mode = mcview_default_hex_mode, changed_hex_mode = 0;
int def_nroff_flag = mcview_default_nroff_flag, changed_nroff_flag = 0;
(void) target;
mcview_altered_hex_mode = 0;
mcview_altered_nroff_flag = 0;
if (def_hex_mode != mcview_default_hex_mode)
@ -387,8 +403,8 @@ exec_extension_cd (void)
/* --------------------------------------------------------------------------------------------- */
static void
exec_extension (const vfs_path_t * filename_vpath, const char *lc_data, int start_line)
static vfs_path_t *
exec_extension (void *target, const vfs_path_t * filename_vpath, const char *lc_data, int start_line)
{
char *shell_string, *export_variables;
vfs_path_t *script_vpath = NULL;
@ -396,7 +412,7 @@ exec_extension (const vfs_path_t * filename_vpath, const char *lc_data, int star
FILE *cmd_file;
char *cmd = NULL;
g_return_if_fail (lc_data != NULL);
g_return_val_if_fail (lc_data != NULL, NULL);
pbuffer = NULL;
localmtime = 0;
@ -466,8 +482,7 @@ exec_extension (const vfs_path_t * filename_vpath, const char *lc_data, int star
if ((run_view && !written_nonspace) || is_cd)
{
mc_unlink (script_vpath);
vfs_path_free (script_vpath);
exec_cleanup_script (script_vpath);
script_vpath = NULL;
}
else
@ -486,12 +501,9 @@ exec_extension (const vfs_path_t * filename_vpath, const char *lc_data, int star
{
/* If we've written whitespace only, then just load filename into view */
if (!written_nonspace)
exec_extension_view (NULL, filename_vpath, start_line);
exec_extension_view (target, NULL, filename_vpath, start_line);
else
{
exec_extension_view (cmd, filename_vpath, start_line);
mc_unlink (script_vpath);
}
exec_extension_view (target, cmd, filename_vpath, start_line);
}
else
{
@ -510,7 +522,7 @@ exec_extension (const vfs_path_t * filename_vpath, const char *lc_data, int star
exec_cleanup_file_name (filename_vpath, TRUE);
ret:
vfs_path_free (script_vpath);
return script_vpath;
}
/* --------------------------------------------------------------------------------------------- */
@ -755,6 +767,7 @@ flush_extension_file (void)
/* --------------------------------------------------------------------------------------------- */
/**
* The second argument is action, i.e. Open, View or Edit
* Use target object to open file in.
*
* This function returns:
*
@ -767,7 +780,8 @@ flush_extension_file (void)
*/
int
regex_command (const vfs_path_t * filename_vpath, const char *action)
regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *action,
vfs_path_t ** script_vpath)
{
char *filename, *p, *q, *r, c;
size_t file_len;
@ -783,6 +797,9 @@ regex_command (const vfs_path_t * filename_vpath, const char *action)
if (filename_vpath == NULL)
return 0;
if (script_vpath != NULL)
*script_vpath = NULL;
/* Check for the special View:%d parameter */
if (strncmp (action, "View:", 5) == 0)
{
@ -1021,7 +1038,14 @@ regex_command (const vfs_path_t * filename_vpath, const char *action)
*/
if (p < q)
{
exec_extension (filename_vpath, r + 1, view_at_line_number);
vfs_path_t *sv;
sv = exec_extension (target, filename_vpath, r + 1, view_at_line_number);
if (script_vpath != NULL)
*script_vpath = sv;
else
exec_cleanup_script (sv);
ret = 1;
}
break;

10
src/filemanager/ext.h
View File

@ -14,7 +14,8 @@
/*** declarations of public functions ************************************************************/
int regex_command (const vfs_path_t * filename_vpath, const char *action);
int regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *action,
vfs_path_t ** script_vpath);
/* Call it after the user has edited the mc.ext file,
* to flush the cached mc.ext file
@ -22,4 +23,11 @@ int regex_command (const vfs_path_t * filename_vpath, const char *action);
void flush_extension_file (void);
/*** inline functions ****************************************************************************/
static inline int
regex_command (const vfs_path_t * filename_vpath, const char *action)
{
return regex_command_for (NULL, filename_vpath, action, NULL);
}
#endif /* MC__EXT_H */