parent
56b0c04b7c
commit
02b6e4db39
|
@ -80,7 +80,6 @@ void *alloca (size_t);
|
||||||
#include <Evas.h>
|
#include <Evas.h>
|
||||||
#include <Evas_Engine_Buffer.h>
|
#include <Evas_Engine_Buffer.h>
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
#include <Ecore_Str.h>
|
|
||||||
#include <Ecore_X.h>
|
#include <Ecore_X.h>
|
||||||
#include <Ecore_X_Atoms.h>
|
#include <Ecore_X_Atoms.h>
|
||||||
#include <Ecore_X_Cursor.h>
|
#include <Ecore_X_Cursor.h>
|
||||||
|
|
|
@ -2387,13 +2387,13 @@ _delayed_action_list_parse(Delayed_Action *da, const char *params)
|
||||||
const char *action, *params;
|
const char *action, *params;
|
||||||
|
|
||||||
a1 = alloca(a1stop - a1start + 1);
|
a1 = alloca(a1stop - a1start + 1);
|
||||||
ecore_strlcpy(a1, a1start, a1stop - a1start + 1);
|
eina_strlcpy(a1, a1start, a1stop - a1start + 1);
|
||||||
action = NULL;
|
action = NULL;
|
||||||
params = NULL;
|
params = NULL;
|
||||||
_delayed_action_list_parse_action(a1, &delay, &da->def.action, &da->def.params);
|
_delayed_action_list_parse_action(a1, &delay, &da->def.action, &da->def.params);
|
||||||
|
|
||||||
a2 = alloca(a1stop - a1start + 1);
|
a2 = alloca(a1stop - a1start + 1);
|
||||||
ecore_strlcpy(a2, a2start, a2stop - a2start + 1);
|
eina_strlcpy(a2, a2start, a2stop - a2start + 1);
|
||||||
_delayed_action_list_parse_action(a2, &delay, &da->delayed.action, &da->delayed.params);
|
_delayed_action_list_parse_action(a2, &delay, &da->delayed.action, &da->delayed.params);
|
||||||
}
|
}
|
||||||
da->timer = ecore_timer_add(delay, _delayed_action_cb_timer, da);
|
da->timer = ecore_timer_add(delay, _delayed_action_cb_timer, da);
|
||||||
|
|
|
@ -1230,7 +1230,7 @@ e_config_profile_list(void)
|
||||||
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
|
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
|
||||||
EINA_LIST_FREE(files, file)
|
EINA_LIST_FREE(files, file)
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(p, file, len) >= len)
|
if (eina_strlcpy(p, file, len) >= len)
|
||||||
{
|
{
|
||||||
free(file);
|
free(file);
|
||||||
continue;
|
continue;
|
||||||
|
@ -1258,7 +1258,7 @@ e_config_profile_list(void)
|
||||||
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
|
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
|
||||||
EINA_LIST_FREE(files, file)
|
EINA_LIST_FREE(files, file)
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(p, file, len) >= len)
|
if (eina_strlcpy(p, file, len) >= len)
|
||||||
{
|
{
|
||||||
free(file);
|
free(file);
|
||||||
continue;
|
continue;
|
||||||
|
@ -1448,7 +1448,7 @@ e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
|
||||||
buf[len] = '/';
|
buf[len] = '/';
|
||||||
len++;
|
len++;
|
||||||
|
|
||||||
len2 = ecore_strlcpy(buf + len, domain, sizeof(buf) - len);
|
len2 = eina_strlcpy(buf + len, domain, sizeof(buf) - len);
|
||||||
if (len2 + sizeof(".cfg") >= sizeof(buf) - len) return 0;
|
if (len2 + sizeof(".cfg") >= sizeof(buf) - len) return 0;
|
||||||
|
|
||||||
len += len2;
|
len += len2;
|
||||||
|
|
|
@ -736,8 +736,8 @@ _desklock_auth(char *passwd)
|
||||||
sigaction(SIGABRT, &action, NULL);
|
sigaction(SIGABRT, &action, NULL);
|
||||||
|
|
||||||
current_user = _desklock_auth_get_current_user();
|
current_user = _desklock_auth_get_current_user();
|
||||||
ecore_strlcpy(da.user, current_user, PATH_MAX);
|
eina_strlcpy(da.user, current_user, PATH_MAX);
|
||||||
ecore_strlcpy(da.passwd, passwd, PATH_MAX);
|
eina_strlcpy(da.passwd, passwd, PATH_MAX);
|
||||||
/* security - null out passwd string once we are done with it */
|
/* security - null out passwd string once we are done with it */
|
||||||
for (p = passwd; *p; p++) *p = 0;
|
for (p = passwd; *p; p++) *p = 0;
|
||||||
da.pam.handle = NULL;
|
da.pam.handle = NULL;
|
||||||
|
|
|
@ -414,7 +414,7 @@ _e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfd
|
||||||
basename[i] = '\0';
|
basename[i] = '\0';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
ecore_strlcpy(basename, "unnamed_desktop", sizeof(basename));
|
eina_strlcpy(basename, "unnamed_desktop", sizeof(basename));
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
snprintf(path, sizeof(path), "%s/applications/%s.desktop",
|
snprintf(path, sizeof(path), "%s/applications/%s.desktop",
|
||||||
|
|
|
@ -1560,7 +1560,7 @@ e_fm2_icons_update(Evas_Object *obj)
|
||||||
if (!evas_object_type_get(obj)) return; // safety
|
if (!evas_object_type_get(obj)) return; // safety
|
||||||
if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety
|
if (strcmp(evas_object_type_get(obj), "e_fm")) return; // safety
|
||||||
|
|
||||||
bufused = ecore_strlcpy(buf, sd->realpath, sizeof(buf));
|
bufused = eina_strlcpy(buf, sd->realpath, sizeof(buf));
|
||||||
if (bufused >= sizeof(buf) - 2)
|
if (bufused >= sizeof(buf) - 2)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -1584,7 +1584,7 @@ e_fm2_icons_update(Evas_Object *obj)
|
||||||
if (_e_fm2_file_is_desktop(ic->info.file))
|
if (_e_fm2_file_is_desktop(ic->info.file))
|
||||||
_e_fm2_icon_desktop_load(ic);
|
_e_fm2_icon_desktop_load(ic);
|
||||||
|
|
||||||
if (ecore_strlcpy(pfile, ic->info.file, buffree) >= buffree)
|
if (eina_strlcpy(pfile, ic->info.file, buffree) >= buffree)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
cf = e_fm2_custom_file_get(buf);
|
cf = e_fm2_custom_file_get(buf);
|
||||||
|
@ -3160,7 +3160,7 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
|
||||||
{
|
{
|
||||||
if (dev[1] == '\0')
|
if (dev[1] == '\0')
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
|
if (eina_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -3241,7 +3241,7 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
|
||||||
|
|
||||||
if (buf[0] == '\0')
|
if (buf[0] == '\0')
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
|
if (eina_strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3398,7 +3398,7 @@ _e_fm2_buffer_fill(Evas_Object *obj)
|
||||||
realpath = e_fm2_real_path_get(obj);
|
realpath = e_fm2_real_path_get(obj);
|
||||||
if (!realpath) return 0;
|
if (!realpath) return 0;
|
||||||
|
|
||||||
bufused = ecore_strlcpy(buf, realpath, sizeof(buf));
|
bufused = eina_strlcpy(buf, realpath, sizeof(buf));
|
||||||
if (bufused >= sizeof(buf) - 2) return 0;
|
if (bufused >= sizeof(buf) - 2) return 0;
|
||||||
|
|
||||||
if ((bufused > 0) && (buf[bufused - 1] != '/'))
|
if ((bufused > 0) && (buf[bufused - 1] != '/'))
|
||||||
|
@ -3414,7 +3414,7 @@ _e_fm2_buffer_fill(Evas_Object *obj)
|
||||||
EINA_LIST_FREE(sel, ici)
|
EINA_LIST_FREE(sel, ici)
|
||||||
{
|
{
|
||||||
if (!ici) continue;
|
if (!ici) continue;
|
||||||
if (ecore_strlcpy(pfile, ici->file, buffree) >= buffree) continue;
|
if (eina_strlcpy(pfile, ici->file, buffree) >= buffree) continue;
|
||||||
_e_fm_file_buffer = eina_list_append(_e_fm_file_buffer, _e_fm2_uri_escape(buf));
|
_e_fm_file_buffer = eina_list_append(_e_fm_file_buffer, _e_fm2_uri_escape(buf));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4750,7 +4750,7 @@ _e_fm2_icon_label_set(E_Fm2_Icon *ic, Evas_Object *obj)
|
||||||
* also be fuzzy - up to 4 chars of extn is ok - eg .html but 5 or
|
* also be fuzzy - up to 4 chars of extn is ok - eg .html but 5 or
|
||||||
* more is considered part of the name
|
* more is considered part of the name
|
||||||
*/
|
*/
|
||||||
ecore_strlcpy(buf, ic->info.file, sizeof(buf));
|
eina_strlcpy(buf, ic->info.file, sizeof(buf));
|
||||||
|
|
||||||
len = strlen(buf);
|
len = strlen(buf);
|
||||||
p = strrchr(buf, '.');
|
p = strrchr(buf, '.');
|
||||||
|
@ -6664,7 +6664,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
|
||||||
ic->drag.start = 0;
|
ic->drag.start = 0;
|
||||||
evas_object_geometry_get(ic->obj, &x, &y, &w, &h);
|
evas_object_geometry_get(ic->obj, &x, &y, &w, &h);
|
||||||
realpath = e_fm2_real_path_get(ic->sd->obj);
|
realpath = e_fm2_real_path_get(ic->sd->obj);
|
||||||
p_offset = ecore_strlcpy(buf, realpath, sizeof(buf));
|
p_offset = eina_strlcpy(buf, realpath, sizeof(buf));
|
||||||
if ((p_offset < 1) || (p_offset >= sizeof(buf) - 2)) return;
|
if ((p_offset < 1) || (p_offset >= sizeof(buf) - 2)) return;
|
||||||
if (buf[p_offset - 1] != '/')
|
if (buf[p_offset - 1] != '/')
|
||||||
{
|
{
|
||||||
|
@ -6681,7 +6681,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
|
||||||
const char *s;
|
const char *s;
|
||||||
int s_len;
|
int s_len;
|
||||||
|
|
||||||
if (ecore_strlcpy(p, ici->file, p_length) >= p_length) continue;
|
if (eina_strlcpy(p, ici->file, p_length) >= p_length) continue;
|
||||||
s = _e_fm2_uri_escape(buf);
|
s = _e_fm2_uri_escape(buf);
|
||||||
if (!s) continue;
|
if (!s) continue;
|
||||||
s_len = strlen(s);
|
s_len = strlen(s);
|
||||||
|
@ -7316,8 +7316,8 @@ _e_fm2_cb_icon_sort(const void *data1, const void *data2)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
*/ {
|
*/ {
|
||||||
ecore_strlcpy(buf1, l1, sizeof(buf1));
|
eina_strlcpy(buf1, l1, sizeof(buf1));
|
||||||
ecore_strlcpy(buf2, l2, sizeof(buf2));
|
eina_strlcpy(buf2, l2, sizeof(buf2));
|
||||||
}
|
}
|
||||||
p = buf1;
|
p = buf1;
|
||||||
while (*p)
|
while (*p)
|
||||||
|
|
|
@ -48,7 +48,7 @@ e_fm_mime_icon_get(const char *mime)
|
||||||
val = eina_hash_find(icon_map, mime);
|
val = eina_hash_find(icon_map, mime);
|
||||||
if (val) return val;
|
if (val) return val;
|
||||||
|
|
||||||
ecore_strlcpy(buf2, mime, sizeof(buf2));
|
eina_strlcpy(buf2, mime, sizeof(buf2));
|
||||||
val = strchr(buf2, '/');
|
val = strchr(buf2, '/');
|
||||||
if (val) *val = 0;
|
if (val) *val = 0;
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ e_fm_mime_icon_get(const char *mime)
|
||||||
{
|
{
|
||||||
if (e_util_glob_match(mi->mime, mime))
|
if (e_util_glob_match(mi->mime, mime))
|
||||||
{
|
{
|
||||||
ecore_strlcpy(buf, mi->icon, sizeof(buf));
|
eina_strlcpy(buf, mi->icon, sizeof(buf));
|
||||||
goto ok;
|
goto ok;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,12 +87,12 @@ e_fm_mime_icon_get(const char *mime)
|
||||||
/* 3. look up icon in theme */
|
/* 3. look up icon in theme */
|
||||||
try_theme:
|
try_theme:
|
||||||
memcpy(buf, "e/icons/fileman/mime/", sizeof("e/icons/fileman/mime/") - 1);
|
memcpy(buf, "e/icons/fileman/mime/", sizeof("e/icons/fileman/mime/") - 1);
|
||||||
ecore_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, mime,
|
eina_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, mime,
|
||||||
sizeof(buf) - (sizeof("e/icons/fileman/mime/") - 1));
|
sizeof(buf) - (sizeof("e/icons/fileman/mime/") - 1));
|
||||||
val = (char *)e_theme_edje_file_get("base/theme/fileman", buf);
|
val = (char *)e_theme_edje_file_get("base/theme/fileman", buf);
|
||||||
if ((val) && (e_util_edje_collection_exists(val, buf))) goto ok;
|
if ((val) && (e_util_edje_collection_exists(val, buf))) goto ok;
|
||||||
|
|
||||||
ecore_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, buf2,
|
eina_strlcpy(buf + sizeof("e/icons/fileman/mime/") - 1, buf2,
|
||||||
sizeof(buf) - (sizeof("e/icons/fileman/mime/") - 1));
|
sizeof(buf) - (sizeof("e/icons/fileman/mime/") - 1));
|
||||||
val = (char *)e_theme_edje_file_get("base/theme/fileman", buf);
|
val = (char *)e_theme_edje_file_get("base/theme/fileman", buf);
|
||||||
if ((val) && (e_util_edje_collection_exists(val, buf))) goto ok;
|
if ((val) && (e_util_edje_collection_exists(val, buf))) goto ok;
|
||||||
|
|
|
@ -1196,7 +1196,7 @@ _e_border_menu_cb_ibar_add_pre(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
|
|
||||||
if (file[0] == '.') continue;
|
if (file[0] == '.') continue;
|
||||||
|
|
||||||
ecore_strlcpy(buf + len, file, sizeof(buf) - len);
|
eina_strlcpy(buf + len, file, sizeof(buf) - len);
|
||||||
if (ecore_file_is_dir(buf))
|
if (ecore_file_is_dir(buf))
|
||||||
{
|
{
|
||||||
smi = e_menu_item_new(sm);
|
smi = e_menu_item_new(sm);
|
||||||
|
|
|
@ -112,7 +112,7 @@ e_prefix_determine(char *argv0)
|
||||||
_prefix_path = malloc(p - _exe_path + 1);
|
_prefix_path = malloc(p - _exe_path + 1);
|
||||||
if (_prefix_path)
|
if (_prefix_path)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(_prefix_path, _exe_path, p - _exe_path + 1);
|
eina_strlcpy(_prefix_path, _exe_path, p - _exe_path + 1);
|
||||||
|
|
||||||
/* bin and lib always together */
|
/* bin and lib always together */
|
||||||
snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
|
snprintf(buf, sizeof(buf), "%s/bin", _prefix_path);
|
||||||
|
@ -261,7 +261,7 @@ _e_prefix_share_hunt(void)
|
||||||
{
|
{
|
||||||
/* path is ok - magic file found */
|
/* path is ok - magic file found */
|
||||||
_prefix_path_data = strdup(buf2);
|
_prefix_path_data = strdup(buf2);
|
||||||
_prefix_path_data_len = ecore_strlcpy(buf, buf2, sizeof(buf));
|
_prefix_path_data_len = eina_strlcpy(buf, buf2, sizeof(buf));
|
||||||
p = strrchr(buf, '/');
|
p = strrchr(buf, '/');
|
||||||
if (p) *p = 0;
|
if (p) *p = 0;
|
||||||
snprintf(buf2, sizeof(buf2), "%s/locale", buf);
|
snprintf(buf2, sizeof(buf2), "%s/locale", buf);
|
||||||
|
@ -285,7 +285,7 @@ _e_prefix_share_hunt(void)
|
||||||
Eina_List *files;
|
Eina_List *files;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
ecore_strlcpy(buf, _prefix_path, sizeof(buf));
|
eina_strlcpy(buf, _prefix_path, sizeof(buf));
|
||||||
p = strrchr(buf, '/');
|
p = strrchr(buf, '/');
|
||||||
if (p) *p = 0;
|
if (p) *p = 0;
|
||||||
files = ecore_file_ls(buf);
|
files = ecore_file_ls(buf);
|
||||||
|
@ -318,7 +318,7 @@ _e_prefix_share_hunt(void)
|
||||||
*/
|
*/
|
||||||
if (!_prefix_path_data)
|
if (!_prefix_path_data)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(buf, _prefix_path, sizeof(buf));
|
eina_strlcpy(buf, _prefix_path, sizeof(buf));
|
||||||
p = strrchr(buf, '/');
|
p = strrchr(buf, '/');
|
||||||
if (p) *p = 0;
|
if (p) *p = 0;
|
||||||
snprintf(buf2, sizeof(buf2), "%s/"MAGIC_DAT, buf);
|
snprintf(buf2, sizeof(buf2), "%s/"MAGIC_DAT, buf);
|
||||||
|
@ -521,7 +521,7 @@ _e_prefix_try_argv(char *argv0)
|
||||||
size_t
|
size_t
|
||||||
e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len)
|
e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len)
|
||||||
{
|
{
|
||||||
return ecore_str_join_len(dst, size, '/', _prefix_path_data, _prefix_path_data_len, path, path_len);
|
return eina_str_join_len(dst, size, '/', _prefix_path_data, _prefix_path_data_len, path, path_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
|
|
|
@ -155,7 +155,7 @@ e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* no mapping or set failed - fall back */
|
/* no mapping or set failed - fall back */
|
||||||
ecore_strlcpy(buf, category, sizeof(buf));
|
eina_strlcpy(buf, category, sizeof(buf));
|
||||||
/* shorten string up to and not including last / char */
|
/* shorten string up to and not including last / char */
|
||||||
p = strrchr(buf, '/');
|
p = strrchr(buf, '/');
|
||||||
if (p) *p = 0;
|
if (p) *p = 0;
|
||||||
|
@ -237,7 +237,7 @@ e_theme_edje_file_get(const char *category, const char *group)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* no mapping or set failed - fall back */
|
/* no mapping or set failed - fall back */
|
||||||
ecore_strlcpy(buf, category, sizeof(buf));
|
eina_strlcpy(buf, category, sizeof(buf));
|
||||||
/* shorten string up to and not including last / char */
|
/* shorten string up to and not including last / char */
|
||||||
p = strrchr(buf, '/');
|
p = strrchr(buf, '/');
|
||||||
if (p) *p = 0;
|
if (p) *p = 0;
|
||||||
|
|
|
@ -46,7 +46,7 @@ e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_
|
||||||
if (!_e_user_homedir)
|
if (!_e_user_homedir)
|
||||||
e_user_homedir_get();
|
e_user_homedir_get();
|
||||||
|
|
||||||
return ecore_str_join_len(dst, size, '/', _e_user_homedir, _e_user_homedir_len, path, path_len);
|
return eina_str_join_len(dst, size, '/', _e_user_homedir, _e_user_homedir_len, path, path_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI size_t
|
EAPI size_t
|
||||||
|
@ -156,7 +156,7 @@ e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len)
|
||||||
if (!_e_user_dir)
|
if (!_e_user_dir)
|
||||||
e_user_dir_get();
|
e_user_dir_get();
|
||||||
|
|
||||||
return ecore_str_join_len(dst, size, '/', _e_user_dir, _e_user_dir_len, path, path_len);
|
return eina_str_join_len(dst, size, '/', _e_user_dir, _e_user_dir_len, path, path_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI size_t
|
EAPI size_t
|
||||||
|
|
|
@ -752,13 +752,13 @@ _e_exebuf_complete(void)
|
||||||
exe = ecore_file_app_exe_get(exe_sel->desktop->exec);
|
exe = ecore_file_app_exe_get(exe_sel->desktop->exec);
|
||||||
if (exe)
|
if (exe)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(cmd_buf, exe, EXEBUFLEN);
|
eina_strlcpy(cmd_buf, exe, EXEBUFLEN);
|
||||||
free(exe);
|
free(exe);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (exe_sel->file)
|
else if (exe_sel->file)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(cmd_buf, exe_sel->file, EXEBUFLEN);
|
eina_strlcpy(cmd_buf, exe_sel->file, EXEBUFLEN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -797,7 +797,7 @@ _e_exebuf_complete(void)
|
||||||
}
|
}
|
||||||
if ((exe) && (orig_len < common_len) && (common_len < (EXEBUFLEN - 1)))
|
if ((exe) && (orig_len < common_len) && (common_len < (EXEBUFLEN - 1)))
|
||||||
{
|
{
|
||||||
ecore_strlcpy(cmd_buf, exe, common_len + 1);
|
eina_strlcpy(cmd_buf, exe, common_len + 1);
|
||||||
}
|
}
|
||||||
if (clear_hist)
|
if (clear_hist)
|
||||||
_e_exebuf_hist_clear();
|
_e_exebuf_hist_clear();
|
||||||
|
|
|
@ -709,7 +709,7 @@ _e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin_Page *page, Eina_Bool skip_h
|
||||||
if (ext == E_FWIN_EXEC_NONE)
|
if (ext == E_FWIN_EXEC_NONE)
|
||||||
{
|
{
|
||||||
if (!((ici->link) && (ici->mount)))
|
if (!((ici->link) && (ici->mount)))
|
||||||
ecore_strlcpy(buf, ici->file, sizeof(buf));
|
eina_strlcpy(buf, ici->file, sizeof(buf));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
_e_fwin_file_exec(page, ici, ext);
|
_e_fwin_file_exec(page, ici, ext);
|
||||||
|
@ -938,7 +938,7 @@ _e_fwin_window_title_set(E_Fwin_Page *page)
|
||||||
|
|
||||||
if (file)
|
if (file)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(buf, file, sizeof(buf));
|
eina_strlcpy(buf, file, sizeof(buf));
|
||||||
e_win_title_set(page->fwin->win, buf);
|
e_win_title_set(page->fwin->win, buf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -279,7 +279,7 @@ _load_tlist(E_Config_Dialog_Data *cfdata)
|
||||||
EINA_LIST_FREE(dirs, file)
|
EINA_LIST_FREE(dirs, file)
|
||||||
{
|
{
|
||||||
if (file[0] == '.') continue;
|
if (file[0] == '.') continue;
|
||||||
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
||||||
continue;
|
continue;
|
||||||
if (ecore_file_is_dir(buf))
|
if (ecore_file_is_dir(buf))
|
||||||
{
|
{
|
||||||
|
|
|
@ -272,7 +272,7 @@ _ibar_new(Evas *evas, Instance *inst)
|
||||||
e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order",
|
e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order",
|
||||||
inst->ci->dir);
|
inst->ci->dir);
|
||||||
else
|
else
|
||||||
ecore_strlcpy(buf, inst->ci->dir, sizeof(buf));
|
eina_strlcpy(buf, inst->ci->dir, sizeof(buf));
|
||||||
b->apps = e_order_new(buf);
|
b->apps = e_order_new(buf);
|
||||||
e_order_update_callback_set(b->apps, _ibar_cb_app_change, b);
|
e_order_update_callback_set(b->apps, _ibar_cb_app_change, b);
|
||||||
_ibar_fill(b);
|
_ibar_fill(b);
|
||||||
|
@ -491,7 +491,7 @@ _ibar_config_update(Config_Item *ci)
|
||||||
e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order",
|
e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order",
|
||||||
inst->ci->dir);
|
inst->ci->dir);
|
||||||
else
|
else
|
||||||
ecore_strlcpy(buf, inst->ci->dir, sizeof(buf));
|
eina_strlcpy(buf, inst->ci->dir, sizeof(buf));
|
||||||
inst->ibar->apps = e_order_new(buf);
|
inst->ibar->apps = e_order_new(buf);
|
||||||
_ibar_fill(inst->ibar);
|
_ibar_fill(inst->ibar);
|
||||||
_ibar_resize_handle(inst->ibar);
|
_ibar_resize_handle(inst->ibar);
|
||||||
|
|
|
@ -555,7 +555,7 @@ _il_home_apps_unpopulate(void)
|
||||||
|
|
||||||
EINA_LIST_FREE(files, file)
|
EINA_LIST_FREE(files, file)
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buff + len, file, sizeof(buff) - len) >= sizeof(buff) - len)
|
if (eina_strlcpy(buff + len, file, sizeof(buff) - len) >= sizeof(buff) - len)
|
||||||
continue;
|
continue;
|
||||||
ecore_file_unlink(buff);
|
ecore_file_unlink(buff);
|
||||||
free(file);
|
free(file);
|
||||||
|
@ -700,7 +700,7 @@ _il_home_desktop_find_border(E_Zone *zone, Efreet_Desktop *desktop)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
exe = malloc(p - desktop->exec + 1);
|
exe = malloc(p - desktop->exec + 1);
|
||||||
if (exe) ecore_strlcpy(exe, desktop->exec, p - desktop->exec + 1);
|
if (exe) eina_strlcpy(exe, desktop->exec, p - desktop->exec + 1);
|
||||||
}
|
}
|
||||||
if (exe)
|
if (exe)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1073,7 +1073,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
|
||||||
p = strrchr(file, '.');
|
p = strrchr(file, '.');
|
||||||
if ((p) && (!strcmp(p, ".kbd")))
|
if ((p) && (!strcmp(p, ".kbd")))
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
||||||
continue;
|
continue;
|
||||||
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
||||||
}
|
}
|
||||||
|
@ -1104,7 +1104,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
|
||||||
}
|
}
|
||||||
if (ok)
|
if (ok)
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
||||||
continue;
|
continue;
|
||||||
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1113,7 +1113,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
|
||||||
p = strrchr(file, '.');
|
p = strrchr(file, '.');
|
||||||
if ((p) && (!strcmp(p, ".kbd")))
|
if ((p) && (!strcmp(p, ".kbd")))
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
||||||
continue;
|
continue;
|
||||||
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
||||||
}
|
}
|
||||||
|
@ -1144,7 +1144,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
|
||||||
}
|
}
|
||||||
if (ok)
|
if (ok)
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
||||||
continue;
|
continue;
|
||||||
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
kbs = eina_list_append(kbs, eina_stringshare_add(buf));
|
||||||
}
|
}
|
||||||
|
|
|
@ -622,7 +622,7 @@ _desktop_run(Efreet_Desktop *desktop)
|
||||||
exename = malloc(p - desktop->exec + 1);
|
exename = malloc(p - desktop->exec + 1);
|
||||||
if (exename)
|
if (exename)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(exename, desktop->exec, p - desktop->exec + 1);
|
eina_strlcpy(exename, desktop->exec, p - desktop->exec + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (exename)
|
if (exename)
|
||||||
|
@ -972,7 +972,7 @@ _apps_unpopulate(void)
|
||||||
|
|
||||||
EINA_LIST_FREE(files, file)
|
EINA_LIST_FREE(files, file)
|
||||||
{
|
{
|
||||||
if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
|
||||||
continue;
|
continue;
|
||||||
ecore_file_unlink(buf);
|
ecore_file_unlink(buf);
|
||||||
free(file);
|
free(file);
|
||||||
|
|
|
@ -816,7 +816,7 @@ _systray_theme(Evas_Object *o, const char *shelf_style, const char *gc_style)
|
||||||
char buf[128], *p;
|
char buf[128], *p;
|
||||||
size_t len, avail;
|
size_t len, avail;
|
||||||
|
|
||||||
len = ecore_strlcpy(buf, _group_gadget, sizeof(buf));
|
len = eina_strlcpy(buf, _group_gadget, sizeof(buf));
|
||||||
if (len >= sizeof(buf))
|
if (len >= sizeof(buf))
|
||||||
goto fallback;
|
goto fallback;
|
||||||
p = buf + len;
|
p = buf + len;
|
||||||
|
@ -835,7 +835,7 @@ _systray_theme(Evas_Object *o, const char *shelf_style, const char *gc_style)
|
||||||
if (shelf_style)
|
if (shelf_style)
|
||||||
{
|
{
|
||||||
size_t r;
|
size_t r;
|
||||||
r = ecore_strlcpy(p, shelf_style, avail);
|
r = eina_strlcpy(p, shelf_style, avail);
|
||||||
if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
|
if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -843,7 +843,7 @@ _systray_theme(Evas_Object *o, const char *shelf_style, const char *gc_style)
|
||||||
if (gc_style)
|
if (gc_style)
|
||||||
{
|
{
|
||||||
size_t r;
|
size_t r;
|
||||||
r = ecore_strlcpy(p, gc_style, avail);
|
r = eina_strlcpy(p, gc_style, avail);
|
||||||
if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
|
if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -862,7 +862,7 @@ _systray_theme(Evas_Object *o, const char *shelf_style, const char *gc_style)
|
||||||
if (shelf_style)
|
if (shelf_style)
|
||||||
{
|
{
|
||||||
size_t r;
|
size_t r;
|
||||||
r = ecore_strlcpy(p, shelf_style, avail);
|
r = eina_strlcpy(p, shelf_style, avail);
|
||||||
if (r < avail && edje_object_file_set(o, path, buf))
|
if (r < avail && edje_object_file_set(o, path, buf))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -870,7 +870,7 @@ _systray_theme(Evas_Object *o, const char *shelf_style, const char *gc_style)
|
||||||
if (gc_style)
|
if (gc_style)
|
||||||
{
|
{
|
||||||
size_t r;
|
size_t r;
|
||||||
r = ecore_strlcpy(p, gc_style, avail);
|
r = eina_strlcpy(p, gc_style, avail);
|
||||||
if (r < avail && edje_object_file_set(o, path, buf))
|
if (r < avail && edje_object_file_set(o, path, buf))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,7 +137,7 @@ wizard_page_show(E_Wizard_Page *pg)
|
||||||
tlabel = malloc(p2 - p + 1);
|
tlabel = malloc(p2 - p + 1);
|
||||||
if (tlabel)
|
if (tlabel)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(tlabel, p, p2 - p + 1);
|
eina_strlcpy(tlabel, p, p2 - p + 1);
|
||||||
tlabel[0] = toupper(tlabel[0]);
|
tlabel[0] = toupper(tlabel[0]);
|
||||||
if (*p2 == '-')
|
if (*p2 == '-')
|
||||||
{
|
{
|
||||||
|
@ -148,7 +148,7 @@ wizard_page_show(E_Wizard_Page *pg)
|
||||||
tdesc = malloc(p - p2 + 1);
|
tdesc = malloc(p - p2 + 1);
|
||||||
if (tdesc)
|
if (tdesc)
|
||||||
{
|
{
|
||||||
ecore_strlcpy(tdesc, p2, p - p2 + 1);
|
eina_strlcpy(tdesc, p2, p - p2 + 1);
|
||||||
tdesc[0] = toupper(tdesc[0]);
|
tdesc[0] = toupper(tdesc[0]);
|
||||||
snprintf(buf, sizeof(buf), "%s (%s)", tlabel, tdesc);
|
snprintf(buf, sizeof(buf), "%s (%s)", tlabel, tdesc);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue