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

that is bad code as rusty says - though fix it a different way. 

SVN revision: 74252
This commit is contained in:
Carsten Haitzler 2012-07-20 14:40:19 +00:00
parent db0049e248
commit 7ac8b4fd31
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/bin/e_fm_op.c
View File

@ -1163,30 +1163,36 @@ _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)
{ {
size_t len; int len;
char path[PATH_MAX]; char path[PATH_MAX];
len = readlink(task->src.name, &path[0], PATH_MAX); len = readlink(task->src.name, path, sizeof(path) - 1);
path[len] = 0; if (len < 0)
if (symlink(path, task->dst.name) != 0)
{ {
if (errno == EEXIST) _E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot read link '%s'.", task->src.name);
}
else
{
path[len] = 0;
if (symlink(path, task->dst.name) != 0)
{ {
if (unlink(task->dst.name) == -1) if (errno == EEXIST)
_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 (unlink(task->dst.name) == -1)
_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)
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", path, task->dst.name);
}
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.", path, task->dst.name);
} }
else
_E_FM_OP_ERROR_SEND_WORK(task, E_FM_OP_ERROR, "Cannot create link from '%s' to '%s': %s.", path, task->dst.name);
} }
task->dst.done += task->src.st.st_size; task->dst.done += task->src.st.st_size;
_e_fm_op_update_progress(task, task->src.st.st_size, 0); _e_fm_op_update_progress(task, task->src.st.st_size, 0);
_e_fm_op_copy_stat_info(task); _e_fm_op_copy_stat_info(task);
task->finished = 1; task->finished = 1;
return 0; return 0;