mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(is_in_linklist): refactoring: return pointer to found link. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-09-26 13:55:08 +03:00
parent 7c9e3817ce
commit c94cd7620d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/filemanager/file.c
View File

@ -304,7 +304,7 @@ free_linklist (GSList * lp)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static gboolean static const struct link *
is_in_linklist (const GSList * lp, const vfs_path_t * vpath, const struct stat *sb) is_in_linklist (const GSList * lp, const vfs_path_t * vpath, const struct stat *sb)
{ {
const struct vfs_class *class; const struct vfs_class *class;
@ -318,9 +318,10 @@ is_in_linklist (const GSList * lp, const vfs_path_t * vpath, const struct stat *
const struct link *lnk = (const struct link *) lp->data; const struct link *lnk = (const struct link *) lp->data;
if (lnk->vfs == class && lnk->ino == ino && lnk->dev == dev) if (lnk->vfs == class && lnk->ino == ino && lnk->dev == dev)
return TRUE; return lnk;
} }
return FALSE;
return NULL;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -2686,7 +2687,7 @@ copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const cha
goto ret_fast; goto ret_fast;
} }
if (is_in_linklist (dest_dirs, src_vpath, &cbuf)) if (is_in_linklist (dest_dirs, src_vpath, &cbuf) != NULL)
{ {
/* Don't copy a directory we created before (we don't want to copy /* Don't copy a directory we created before (we don't want to copy
infinitely if a directory is copied into itself) */ infinitely if a directory is copied into itself) */
@ -2719,7 +2720,7 @@ copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const cha
goto ret_fast; goto ret_fast;
} }
if (is_in_linklist (parent_dirs, src_vpath, &cbuf)) if (is_in_linklist (parent_dirs, src_vpath, &cbuf) != NULL)
{ {
/* we found a cyclic symbolic link */ /* we found a cyclic symbolic link */
message (D_ERROR, MSG_ERROR, _("Cannot copy cyclic symbolic link\n\"%s\""), s); message (D_ERROR, MSG_ERROR, _("Cannot copy cyclic symbolic link\n\"%s\""), s);