enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

e_fm_op: cleanup and fix memory leaks. 

* reduce variable scope to avoid bugs.

 * add missing free(d)

 * move invariant snprintf() out of loop



SVN revision: 39548
This commit is contained in:
Gustavo Sverzut Barbieri 2009-03-18 14:06:22 +00:00
parent ae0aa2ed8b
commit e636f913c5
1 changed files with 96 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/bin/e_fm_op.c
View File

@ -126,13 +126,8 @@ struct _E_Fm_Op_Copy_Data
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
E_Fm_Op_Task *task = NULL;
int i, last; int i, last;
char *byte = "/";
char buf[PATH_MAX];
const char *name = NULL;
E_Fm_Op_Type type; E_Fm_Op_Type type;
char *p = NULL, *p2 = NULL;
ecore_init(); ecore_init();
eina_stringshare_init(); eina_stringshare_init();
@ -162,93 +157,122 @@ main(int argc, char **argv)
{ {
if (argc < 4) goto quit; if (argc < 4) goto quit;
if (type == E_FM_OP_MOVE) if (type == E_FM_OP_MOVE)
{ {
_e_fm_op_work_queue = eina_list_append(_e_fm_op_work_queue, NULL); _e_fm_op_work_queue = eina_list_append(_e_fm_op_work_queue, NULL);
_e_fm_op_separator = _e_fm_op_work_queue; _e_fm_op_separator = _e_fm_op_work_queue;
} }
if ((argc >= 4) && (ecore_file_is_dir(argv[last]))) if ((argc >= 4) && (ecore_file_is_dir(argv[last])))
{ {
if (argv[last][strlen(argv[last]) - 1] == '/') byte = ""; char buf[PATH_MAX];
p2 = ecore_file_realpath(argv[last]); char *p2, *p3;
int p2_len, last_len;
for(; i < last; i++) p2 = ecore_file_realpath(argv[last]);
{ if (!p2) goto quit;
p = ecore_file_realpath(argv[i]); p2_len = strlen(p2);
/* Don't move a dir into itself */ last_len = strlen(argv[last]);
if ((p) && (p2) && (ecore_file_is_dir(argv[i])) && if ((last_len < 1) || (last_len + 2 >= PATH_MAX))
(strstr(p2, p) == p2)) {
continue; free(p2);
goto quit;
}
memcpy(buf, argv[last], last_len);
if (buf[last_len - 1] != '/')
{
buf[last_len] = '/';
last_len++;
}
name = ecore_file_file_get(argv[i]); p3 = buf + last_len;
task = _e_fm_op_task_new();
task->type = type;
task->src.name = eina_stringshare_add(argv[i]);
snprintf(buf, PATH_MAX, "%s%s%s", argv[last], byte, name); for (; i < last; i++)
task->dst.name = eina_stringshare_add(buf); {
char *p = ecore_file_realpath(argv[i]);
const char *name;
int name_len;
if ((type == E_FM_OP_MOVE) && if (!p) continue;
(rename(task->src.name, task->dst.name) == 0))
{ /* Don't move a dir into itself */
_e_fm_op_update_progress_report_simple_done if (ecore_file_is_dir(p) &&
(task->src.name, task->dst.name); (strncmp(p, p2, p2_len) == 0) &&
_e_fm_op_task_free(task); ((p[p2_len] == '/') || (p[p2_len] == '\0')))
} goto skip_arg;
name = ecore_file_file_get(p);
if (!name) goto skip_arg;
name_len = strlen(name);
if (p2_len + name_len >= PATH_MAX) goto skip_arg;
memcpy(p3, name, name_len + 1);
if ((type == E_FM_OP_MOVE) &&
(rename(argv[i], buf) == 0))
_e_fm_op_update_progress_report_simple_done(argv[i], buf);
else if ((type == E_FM_OP_SYMLINK) && else if ((type == E_FM_OP_SYMLINK) &&
(symlink(task->src.name, task->dst.name) == 0)) (symlink(argv[i], buf) == 0))
_e_fm_op_update_progress_report_simple_done(argv[i], buf);
else
{ {
_e_fm_op_update_progress_report_simple_done E_Fm_Op_Task *task;
(task->src.name, task->dst.name);
_e_fm_op_task_free(task); task = _e_fm_op_task_new();
task->type = type;
task->src.name = eina_stringshare_add(argv[i]);
task->dst.name = eina_stringshare_add(buf);
_e_fm_op_scan_queue =
eina_list_append(_e_fm_op_scan_queue, task);
} }
else
_e_fm_op_scan_queue =
eina_list_append(_e_fm_op_scan_queue, task);
}
}
else if (argc == 4)
{
snprintf(buf, sizeof(buf), "%s/%s", ecore_file_realpath(argv[i]),
ecore_file_file_get(argv[i]));
p = strdup(buf);
snprintf(buf, sizeof(buf), "%s/%s", skip_arg:
ecore_file_realpath(argv[last]), free(p);
ecore_file_file_get(argv[last])); }
p2 = strdup(buf);
/* Don't move a file on top of itself. */ free(p2);
i = (strlen(p) == strlen(p2)) && !strncmp(p,p2,strlen(p)); }
free(p); else if (argc == 4)
free(p2); {
if (i) goto quit; char *p, *p2;
/* Try a rename */ p = ecore_file_realpath(argv[2]);
if ((type == E_FM_OP_MOVE) && (rename(argv[2], argv[3]) == 0)) p2 = ecore_file_realpath(argv[3]);
/* Don't move a file on top of itself. */
i = (strcmp(p, p2) == 0);
free(p);
free(p2);
if (i) goto quit;
/* Try a rename */
if ((type == E_FM_OP_MOVE) && (rename(argv[2], argv[3]) == 0))
{ {
_e_fm_op_update_progress_report_simple_done(argv[2], argv[3]); _e_fm_op_update_progress_report_simple_done(argv[2], argv[3]);
goto quit; goto quit;
} }
else if ((type == E_FM_OP_SYMLINK) && else if ((type == E_FM_OP_SYMLINK) &&
(symlink(argv[2], argv[3]) == 0)) (symlink(argv[2], argv[3]) == 0))
{ {
_e_fm_op_update_progress_report_simple_done(argv[2], argv[3]); _e_fm_op_update_progress_report_simple_done(argv[2], argv[3]);
goto quit; goto quit;
} }
else
{
E_Fm_Op_Task *task;
/* If that doesn't work, setup a copy and delete operation. /* If that doesn't work, setup a copy and delete operation.
It's not atomic, but it's the best we can do. */ It's not atomic, but it's the best we can do. */
task = _e_fm_op_task_new(); task = _e_fm_op_task_new();
task->type = type; task->type = type;
task->src.name = eina_stringshare_add(argv[2]); task->src.name = eina_stringshare_add(argv[2]);
task->dst.name = eina_stringshare_add(argv[3]); task->dst.name = eina_stringshare_add(argv[3]);
_e_fm_op_scan_queue = eina_list_append(_e_fm_op_scan_queue, task); _e_fm_op_scan_queue = eina_list_append(_e_fm_op_scan_queue, task);
} }
else }
goto quit; else
goto quit;
} }
else if (type == E_FM_OP_REMOVE) else if (type == E_FM_OP_REMOVE)
{ {
@ -256,6 +280,8 @@ main(int argc, char **argv)
while (i <= last) while (i <= last)
{ {
E_Fm_Op_Task *task;
task = _e_fm_op_task_new(); task = _e_fm_op_task_new();
task->type = type; task->type = type;
task->src.name = eina_stringshare_add(argv[i]); task->src.name = eina_stringshare_add(argv[i]);