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

use strbufs instead of strcat in fwin navbars 

CIDs 1039794, 1039795, 1039796
This commit is contained in:
Mike Blumenkrantz 2016-02-29 07:55:37 -05:00
parent f546997405
commit a04a93e5ef
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/modules/fileman/e_fwin_nav.c
View File

@ -240,28 +240,39 @@ out:
_box_button_cb_dnd_leave(inst, type, NULL); _box_button_cb_dnd_leave(inst, type, NULL);
} }
static Eina_Strbuf *
_path_generate(Instance *inst, Evas_Object *break_obj)
{
Nav_Item *ni;
Eina_Strbuf *buf;
buf = eina_strbuf_new();
EINA_INLIST_FOREACH(inst->l_buttons, ni)
{
eina_strbuf_append(buf, edje_object_part_text_get(ni->o, "e.text.label"));
if (break_obj && (ni->o == break_obj)) break;
if (eina_strbuf_length_get(buf)) eina_strbuf_append_char(buf, '/');
}
return buf;
}
static Eina_Bool static Eina_Bool
_box_button_cb_dnd_drop(void *data, const char *type EINA_UNUSED) _box_button_cb_dnd_drop(void *data, const char *type EINA_UNUSED)
{ {
Instance *inst = data; Instance *inst = data;
Nav_Item *ni;
Eina_Bool allow; Eina_Bool allow;
char path[PATH_MAX] = {0}; Eina_Strbuf *buf;
if (!inst->dnd_obj) return EINA_FALSE; if (!inst->dnd_obj) return EINA_FALSE;
EINA_INLIST_FOREACH(inst->l_buttons, ni) buf = _path_generate(inst, inst->dnd_obj);
{ allow = ecore_file_can_write(eina_strbuf_string_get(buf));
strcat(path, edje_object_part_text_get(ni->o, "e.text.label"));
if (ni->o == inst->dnd_obj) break;
if (path[1]) strcat(path, "/");
}
allow = ecore_file_can_write(path);
if (allow) if (allow)
{ {
e_drop_xds_update(allow, path); e_drop_xds_update(allow, eina_strbuf_string_get(buf));
inst->dnd_path = strdup(path); inst->dnd_path = eina_strbuf_string_steal(buf);
} }
eina_strbuf_free(buf);
return allow; return allow;
} }
@ -631,15 +642,17 @@ _cb_button_click(void *data, Evas_Object *obj, const char *emission EINA_UNUSED,
{ {
Instance *inst = data; Instance *inst = data;
Nav_Item *ni; Nav_Item *ni;
char path[PATH_MAX] = ""; Eina_Strbuf *buf;
buf = eina_strbuf_new();
EINA_INLIST_FOREACH(inst->l_buttons, ni) EINA_INLIST_FOREACH(inst->l_buttons, ni)
{ {
strcat(path, edje_object_part_text_get(ni->o, "e.text.label")); eina_strbuf_append(buf, edje_object_part_text_get(ni->o, "e.text.label"));
if (ni->o == obj) break; if (ni->o == obj) break;
strcat(path, "/"); eina_strbuf_append_char(buf, '/');
} }
e_fm2_path_set(inst->o_fm, "/", path); e_fm2_path_set(inst->o_fm, "/", eina_strbuf_string_get(buf));
eina_strbuf_free(buf);
} }
static void static void
@ -670,8 +683,8 @@ _box_button_append(Instance *inst, const char *label, Edje_Signal_Cb func)
{ {
Evas_Object *o; Evas_Object *o;
Evas_Coord mw = 0, mh = 0; Evas_Coord mw = 0, mh = 0;
char path[PATH_MAX] = {0}; Eina_Strbuf *buf;
Nav_Item *ni, *nil; Nav_Item *ni;
if (!inst || !label || !*label || !func) if (!inst || !label || !*label || !func)
return; return;
@ -697,15 +710,12 @@ _box_button_append(Instance *inst, const char *label, Edje_Signal_Cb func)
ni->o = o; ni->o = o;
ni->inst = inst; ni->inst = inst;
inst->l_buttons = eina_inlist_append(inst->l_buttons, EINA_INLIST_GET(ni)); inst->l_buttons = eina_inlist_append(inst->l_buttons, EINA_INLIST_GET(ni));
EINA_INLIST_FOREACH(inst->l_buttons, nil) buf = _path_generate(inst, NULL);
{ ni->path = eina_stringshare_add(eina_strbuf_string_get(buf));
strcat(path, edje_object_part_text_get(nil->o, "e.text.label"));
if (path[1]) strcat(path, "/");
}
ni->path = eina_stringshare_add(path);
ni->monitor = eio_monitor_stringshared_add(ni->path); ni->monitor = eio_monitor_stringshared_add(ni->path);
E_LIST_HANDLER_APPEND(ni->handlers, EIO_MONITOR_SELF_DELETED, _event_deleted, ni); E_LIST_HANDLER_APPEND(ni->handlers, EIO_MONITOR_SELF_DELETED, _event_deleted, ni);
E_LIST_HANDLER_APPEND(ni->handlers, EIO_MONITOR_ERROR, _event_deleted, ni); E_LIST_HANDLER_APPEND(ni->handlers, EIO_MONITOR_ERROR, _event_deleted, ni);
eina_strbuf_free(buf);
} }
static void static void