mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Code refactoring: split src/execute.c:execute_with_vfs_arg() function.

Browse Source 
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2013-01-10 00:48:09 +03:00
parent f43b83e7ee
commit 08a825680b
1 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/execute.c
View File

@ -161,6 +161,59 @@ do_suspend_cmd (void)
edition_post_exec (); edition_post_exec ();
} }
/* --------------------------------------------------------------------------------------------- */
static gboolean
execute_prepare_with_vfs_arg (const vfs_path_t * filename_vpath, vfs_path_t ** localcopy_vpath, time_t *mtime)
{
struct stat st;
/* Simplest case, this file is local */
if ((filename_vpath == NULL && vfs_file_is_local (vfs_get_raw_current_dir ()))
|| vfs_file_is_local (filename_vpath))
return TRUE;
/* FIXME: Creation of new files on VFS is not supported */
if (filename_vpath == NULL)
return FALSE;
*localcopy_vpath = mc_getlocalcopy (filename_vpath);
if (*localcopy_vpath == NULL)
{
char *filename;
filename = vfs_path_to_str (filename_vpath);
message (D_ERROR, MSG_ERROR, _("Cannot fetch a local copy of %s"), filename);
g_free (filename);
return FALSE;
}
mc_stat (*localcopy_vpath, &st);
*mtime = st.st_mtime;
return TRUE;
}
/* --------------------------------------------------------------------------------------------- */
static void
execute_cleanup_with_vfs_arg (const vfs_path_t * filename_vpath, vfs_path_t ** localcopy_vpath, time_t *mtime)
{
if (*localcopy_vpath != NULL)
{
struct stat st;
/*
* filename can be an entry on panel, it can be changed by executing
* the command, so make a copy. Smarter VFS code would make the code
* below unnecessary.
*/
mc_stat (*localcopy_vpath, &st);
mc_ungetlocalcopy (filename_vpath, *localcopy_vpath, *mtime != st.st_mtime);
vfs_path_free (*localcopy_vpath);
*localcopy_vpath = NULL;
}
}
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/ /*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -450,6 +503,7 @@ execute_suspend (const gchar * event_group_name, const gchar * event_name,
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** /**
* Execute command on a filename that can be on VFS. * Execute command on a filename that can be on VFS.
* Errors are reported to the user. * Errors are reported to the user.
@ -458,44 +512,18 @@ execute_suspend (const gchar * event_group_name, const gchar * event_name,
void void
execute_with_vfs_arg (const char *command, const vfs_path_t * filename_vpath) execute_with_vfs_arg (const char *command, const vfs_path_t * filename_vpath)
{ {
struct stat st; vfs_path_t *localcopy_vpath = NULL;
const vfs_path_t *do_execute_vpath;
time_t mtime; time_t mtime;
vfs_path_t *localcopy_vpath;
/* Simplest case, this file is local */ if (!execute_prepare_with_vfs_arg (filename_vpath, &localcopy_vpath, &mtime))
if ((filename_vpath == NULL && vfs_file_is_local (vfs_get_raw_current_dir ()))
|| vfs_file_is_local (filename_vpath))
{
do_execute (command, vfs_path_get_last_path_str (filename_vpath), EXECUTE_INTERNAL);
return;
}
/* FIXME: Creation of new files on VFS is not supported */
if (filename_vpath == NULL)
return; return;
localcopy_vpath = mc_getlocalcopy (filename_vpath); do_execute_vpath = (localcopy_vpath == NULL) ? filename_vpath : localcopy_vpath;
if (localcopy_vpath == NULL)
{
char *filename;
filename = vfs_path_to_str (filename_vpath); do_execute (command, vfs_path_get_last_path_str (do_execute_vpath), EXECUTE_INTERNAL);
message (D_ERROR, MSG_ERROR, _("Cannot fetch a local copy of %s"), filename);
g_free (filename);
return;
}
/* execute_cleanup_with_vfs_arg (filename_vpath, &localcopy_vpath, &mtime);
* filename can be an entry on panel, it can be changed by executing
* the command, so make a copy. Smarter VFS code would make the code
* below unnecessary.
*/
mc_stat (localcopy_vpath, &st);
mtime = st.st_mtime;
do_execute (command, vfs_path_get_last_path_str (localcopy_vpath), EXECUTE_INTERNAL);
mc_stat (localcopy_vpath, &st);
mc_ungetlocalcopy (filename_vpath, localcopy_vpath, mtime != st.st_mtime);
vfs_path_free (localcopy_vpath);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */