resi
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

E17: symlink fixes 

when copying symlinks, it creates a symlink to the
destination but with the name of the pointed file/folder.

It causes problems, ex: we can't copy two symlinks
pointing to the same file, because they will have the
same name.

Also when copying, if it's a link, we fill the destination
in the struct task, then, after we check overwrite with
_e_fm_op_handle_overwrite()

Here is a patch which corrects this.

Patch by Maxime Villard (rustyBSD), modified a bit by me (add 2 free() + formatting)


SVN revision: 74264
This commit is contained in:
Vincent Torri 2012-07-21 13:48:35 +00:00
parent 58be84aa8e
commit 7e40b5f15a
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -34,3 +34,4 @@ Gwanglim Lee <gl77.lee@samsung.com>
Thomas Gstädtner <thomas@gstaedtner.net> Thomas Gstädtner <thomas@gstaedtner.net>
q66 <quaker66@gmail.com> q66 <quaker66@gmail.com>
Tom Hacohen (TAsn) <tom@stosb.com> Tom Hacohen (TAsn) <tom@stosb.com>
Maxime Villard <rustyBSD@gmx.fr>

38
src/bin/e_fm_op.c
View File

@ -1163,30 +1163,30 @@ _e_fm_op_copy_dir(E_Fm_Op_Task *task)
static int static int
_e_fm_op_copy_link(E_Fm_Op_Task *task) _e_fm_op_copy_link(E_Fm_Op_Task *task)
{ {
int len; char *lnk_path;
char path[PATH_MAX];
len = readlink(task->src.name, path, sizeof(path) - 1); lnk_path = ecore_file_readlink(task->src.name);
if (len < 0) if (!lnk_path)
{ {
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot read link '%s'.", task->src.name); _E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot read link '%s'.", task->src.name);
} }
else else
{ {
path[len] = 0; E_FM_OP_DEBUG("Creating link from '%s' to '%s'\n", lnk_path, task->dst.name);
if (symlink(path, task->dst.name) != 0) if (symlink(lnk_path, task->dst.name) != 0)
{ {
if (errno == EEXIST) if (errno == EEXIST)
{ {
if (unlink(task->dst.name) == -1) if (unlink(task->dst.name) == -1)
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot unlink '%s': %s.", task->dst.name); _E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot unlink '%s': %s.", task->dst.name);
if (symlink(path, task->dst.name) == -1) if (symlink(lnk_path, task->dst.name) == -1)
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", path, task->dst.name); _E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", lnk_path, task->dst.name);
} }
else else
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", path, task->dst.name); _E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", lnk_path, task->dst.name);
} }
free(lnk_path);
} }
task->dst.done += task->src.st.st_size; task->dst.done += task->src.st.st_size;
@ -1347,6 +1347,26 @@ _e_fm_op_copy_atom(E_Fm_Op_Task *task)
return 1; return 1;
} }
if (S_ISLNK(task->src.st.st_mode))
{
char *dst_dir;
dst_dir = ecore_file_dir_get(task->dst.name);
if (dst_dir)
{
char dst_path[PATH_MAX];
const char *dst_name;
dst_name = ecore_file_file_get(task->src.name);
if ((strlen(dst_dir) + strlen(dst_name)) >= PATH_MAX)
_E_FM_OP_ERROR_SEND_WORK(task, 0, "Not copying link: path too long", dst_path);
snprintf(dst_path, sizeof(dst_path), "%s/%s", dst_dir, dst_name);
task->dst.name = strdup(dst_path);
free(dst_dir);
}
}
if (_e_fm_op_handle_overwrite(task)) return 1; if (_e_fm_op_handle_overwrite(task)) return 1;
if (S_ISDIR(task->src.st.st_mode)) if (S_ISDIR(task->src.st.st_mode))