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

buffer overflow prevention.... 

SVN revision: 5853
This commit is contained in:
rephorm 2002-01-24 06:15:40 +00:00 committed by rephorm
parent 515693292b
commit dbc39567f3
19 changed files with 185 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/actions.c
View File

@ -162,19 +162,19 @@ e_action_find(char *action, E_Action_Type act, int button,
{
char buf[PATH_MAX];
sprintf(buf, "/actions/%i/name", i);
snprintf(buf, PATH_MAX, "/actions/%i/name", i);
a_name = e_db_str_get(db, buf);
sprintf(buf, "/actions/%i/action", i);
snprintf(buf, PATH_MAX, "/actions/%i/action", i);
a_action = e_db_str_get(db, buf);
sprintf(buf, "/actions/%i/params", i);
snprintf(buf, PATH_MAX, "/actions/%i/params", i);
a_params = e_db_str_get(db, buf);
sprintf(buf, "/actions/%i/event", i);
snprintf(buf, PATH_MAX, "/actions/%i/event", i);
e_db_int_get(db, buf, &a_event);
sprintf(buf, "/actions/%i/button", i);
snprintf(buf, PATH_MAX, "/actions/%i/button", i);
e_db_int_get(db, buf, &a_button);
sprintf(buf, "/actions/%i/key", i);
snprintf(buf, PATH_MAX, "/actions/%i/key", i);
a_key = e_db_str_get(db, buf);
sprintf(buf, "/actions/%i/modifiers", i);
snprintf(buf, PATH_MAX, "/actions/%i/modifiers", i);
e_db_int_get(db, buf, &a_modifiers);
a = NEW(E_Action, 1);
@ -701,7 +701,7 @@ e_act_move_start (E_Object *object, E_Action *a, void *data, int x, int y, int r
e_guides_set_mode(move_mode);
e_guides_set_display_location(display_loc);
e_guides_display_text(buf);
sprintf(buf, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
e_guides_display_icon(buf);
e_guides_move(b->current.x, b->current.y);
e_guides_resize(b->current.w, b->current.h);
@ -882,7 +882,7 @@ e_act_resize_start (E_Object *object, E_Action *a, void *data, int x, int y, int
e_guides_set_mode(resize_mode);
e_guides_set_display_location(display_loc);
e_guides_display_text(buf);
sprintf(buf, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
e_guides_display_icon(buf);
e_guides_move(b->current.x, b->current.y);
e_guides_resize(b->current.w, b->current.h);
@ -1044,7 +1044,7 @@ e_act_resize_h_start (E_Object *object, E_Action *a, void *data, int x, int y, i
e_guides_set_mode(resize_mode);
e_guides_set_display_location(display_loc);
e_guides_display_text(buf);
sprintf(buf, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
e_guides_display_icon(buf);
e_guides_move(b->current.x, b->current.y);
e_guides_resize(b->current.w, b->current.h);
@ -1192,7 +1192,7 @@ e_act_resize_v_start (E_Object *object, E_Action *a, void *data, int x, int y, i
e_guides_set_mode(resize_mode);
e_guides_set_display_location(display_loc);
e_guides_display_text(buf);
sprintf(buf, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png");
e_guides_display_icon(buf);
e_guides_move(b->current.x, b->current.y);
e_guides_resize(b->current.w, b->current.h);

52
src/background.c
View File

@ -79,38 +79,38 @@ e_background_load(char *file)
ZERO(bl, E_Background_Layer, 1);
bg->layers = evas_list_append(bg->layers, bl);
sprintf(buf, "/layers/%i/type", i); e_db_int_get(db, buf, (int*)&(bl->type));
sprintf(buf, "/layers/%i/inlined", i); e_db_int_get(db, buf, &(bl->inlined));
sprintf(buf, "/layers/%i/color_class", i); bl->color_class = e_db_str_get(db, buf);
snprintf(buf, PATH_MAX, "/layers/%i/type", i); e_db_int_get(db, buf, (int*)&(bl->type));
snprintf(buf, PATH_MAX, "/layers/%i/inlined", i); e_db_int_get(db, buf, &(bl->inlined));
snprintf(buf, PATH_MAX, "/layers/%i/color_class", i); bl->color_class = e_db_str_get(db, buf);
if (bl->inlined)
{
sprintf(buf, "%s:/layers/%i/image", file, i); e_strdup(bl->file, buf);
snprintf(buf, PATH_MAX, "%s:/layers/%i/image", file, i); e_strdup(bl->file, buf);
}
else
{
sprintf(buf, "/layers/%i/file", i); bl->file = e_db_str_get(db, buf);
snprintf(buf, PATH_MAX, "/layers/%i/file", i); bl->file = e_db_str_get(db, buf);
}
sprintf(buf, "/layers/%i/scroll.x", i); e_db_float_get(db, buf, &(bl->scroll.x));
sprintf(buf, "/layers/%i/scroll.y", i); e_db_float_get(db, buf, &(bl->scroll.y));
sprintf(buf, "/layers/%i/pos.x", i); e_db_float_get(db, buf, &(bl->pos.x));
sprintf(buf, "/layers/%i/pos.y", i); e_db_float_get(db, buf, &(bl->pos.y));
sprintf(buf, "/layers/%i/size.w", i); e_db_float_get(db, buf, &(bl->size.w));
sprintf(buf, "/layers/%i/size.h", i); e_db_float_get(db, buf, &(bl->size.h));
sprintf(buf, "/layers/%i/size.orig.w", i); e_db_int_get(db, buf, &(bl->size.orig.w));
sprintf(buf, "/layers/%i/size.orig.h", i); e_db_int_get(db, buf, &(bl->size.orig.h));
sprintf(buf, "/layers/%i/fill.w", i); e_db_float_get(db, buf, &(bl->fill.w));
sprintf(buf, "/layers/%i/fill.h", i); e_db_float_get(db, buf, &(bl->fill.h));
sprintf(buf, "/layers/%i/fill.orig.w", i); e_db_int_get(db, buf, &(bl->fill.orig.w));
sprintf(buf, "/layers/%i/fill.orig.h", i); e_db_int_get(db, buf, &(bl->fill.orig.h));
sprintf(buf, "/layers/%i/angle", i); e_db_float_get(db, buf, (float*)&(bl->angle));
sprintf(buf, "/layers/%i/fg.r", i); e_db_int_get(db, buf, &(bl->fg.r));
sprintf(buf, "/layers/%i/fg.g", i); e_db_int_get(db, buf, &(bl->fg.g));
sprintf(buf, "/layers/%i/fg.b", i); e_db_int_get(db, buf, &(bl->fg.b));
sprintf(buf, "/layers/%i/fg.a", i); e_db_int_get(db, buf, &(bl->fg.a));
sprintf(buf, "/layers/%i/bg.r", i); e_db_int_get(db, buf, &(bl->bg.r));
sprintf(buf, "/layers/%i/bg.g", i); e_db_int_get(db, buf, &(bl->bg.g));
sprintf(buf, "/layers/%i/bg.b", i); e_db_int_get(db, buf, &(bl->bg.b));
sprintf(buf, "/layers/%i/bg.a", i); e_db_int_get(db, buf, &(bl->bg.a));
snprintf(buf, PATH_MAX, "/layers/%i/scroll.x", i); e_db_float_get(db, buf, &(bl->scroll.x));
snprintf(buf, PATH_MAX, "/layers/%i/scroll.y", i); e_db_float_get(db, buf, &(bl->scroll.y));
snprintf(buf, PATH_MAX, "/layers/%i/pos.x", i); e_db_float_get(db, buf, &(bl->pos.x));
snprintf(buf, PATH_MAX, "/layers/%i/pos.y", i); e_db_float_get(db, buf, &(bl->pos.y));
snprintf(buf, PATH_MAX, "/layers/%i/size.w", i); e_db_float_get(db, buf, &(bl->size.w));
snprintf(buf, PATH_MAX, "/layers/%i/size.h", i); e_db_float_get(db, buf, &(bl->size.h));
snprintf(buf, PATH_MAX, "/layers/%i/size.orig.w", i); e_db_int_get(db, buf, &(bl->size.orig.w));
snprintf(buf, PATH_MAX, "/layers/%i/size.orig.h", i); e_db_int_get(db, buf, &(bl->size.orig.h));
snprintf(buf, PATH_MAX, "/layers/%i/fill.w", i); e_db_float_get(db, buf, &(bl->fill.w));
snprintf(buf, PATH_MAX, "/layers/%i/fill.h", i); e_db_float_get(db, buf, &(bl->fill.h));
snprintf(buf, PATH_MAX, "/layers/%i/fill.orig.w", i); e_db_int_get(db, buf, &(bl->fill.orig.w));
snprintf(buf, PATH_MAX, "/layers/%i/fill.orig.h", i); e_db_int_get(db, buf, &(bl->fill.orig.h));
snprintf(buf, PATH_MAX, "/layers/%i/angle", i); e_db_float_get(db, buf, (float*)&(bl->angle));
snprintf(buf, PATH_MAX, "/layers/%i/fg.r", i); e_db_int_get(db, buf, &(bl->fg.r));
snprintf(buf, PATH_MAX, "/layers/%i/fg.g", i); e_db_int_get(db, buf, &(bl->fg.g));
snprintf(buf, PATH_MAX, "/layers/%i/fg.b", i); e_db_int_get(db, buf, &(bl->fg.b));
snprintf(buf, PATH_MAX, "/layers/%i/fg.a", i); e_db_int_get(db, buf, &(bl->fg.a));
snprintf(buf, PATH_MAX, "/layers/%i/bg.r", i); e_db_int_get(db, buf, &(bl->bg.r));
snprintf(buf, PATH_MAX, "/layers/%i/bg.g", i); e_db_int_get(db, buf, &(bl->bg.g));
snprintf(buf, PATH_MAX, "/layers/%i/bg.b", i); e_db_int_get(db, buf, &(bl->bg.b));
snprintf(buf, PATH_MAX, "/layers/%i/bg.a", i); e_db_int_get(db, buf, &(bl->bg.a));
}
e_db_close(db);
D_RETURN_(bg);

16
src/border.c
View File

@ -1297,11 +1297,11 @@ e_border_apply_border(E_Border *b)
(b->current.shaded == b->client.h)) prop_shaded = 1;
if (b->client.sticky) prop_sticky = 1;
sprintf(border, "selected-%i.sticky-%i.shaded-%i.bits.db",
snprintf(border, PATH_MAX, "selected-%i.sticky-%i.shaded-%i.bits.db",
prop_selected, prop_sticky, prop_shaded);
borders = e_config_get("borders");
sprintf(buf, "%s%s/%s", borders, style, border);
snprintf(buf, PATH_MAX, "%s%s/%s", borders, style, border);
/* if it's not changed - abort and dont do anything */
if ((b->border_file) && (!strcmp(buf, b->border_file))) D_RETURN;
@ -1859,7 +1859,7 @@ e_border_attach_mouse_grabs(E_Border *b)
{
int i, num;
sprintf(buf, "/grabs/count");
snprintf(buf, PATH_MAX, "/grabs/count");
if (!e_db_int_get(db, buf, &num))
{
e_db_close(db);
@ -1873,9 +1873,9 @@ e_border_attach_mouse_grabs(E_Border *b)
button = -1;
mods = ECORE_EVENT_KEY_MODIFIER_NONE;
any_mod = 0;
sprintf(buf, "/grabs/%i/button", i);
snprintf(buf, PATH_MAX, "/grabs/%i/button", i);
if (!e_db_int_get(db, buf, &button)) continue;
sprintf(buf, "/grabs/%i/modifiers", i);
snprintf(buf, PATH_MAX, "/grabs/%i/modifiers", i);
if (!e_db_int_get(db, buf, &mod)) continue;
if (mod == -1) any_mod = 1;
mods = (Ecore_Event_Key_Modifiers)mod;
@ -2843,7 +2843,7 @@ e_border_print_pos(char *buf, E_Border *b)
{
D_ENTER;
sprintf(buf, "%i, %i",
snprintf(buf, PATH_MAX, "%i, %i",
b->current.x, b->current.y);
D_RETURN;
@ -2856,13 +2856,13 @@ e_border_print_size(char *buf, E_Border *b)
if ((b->client.step.w > 1) || (b->client.step.h > 1))
{
sprintf(buf, "%i x %i",
snprintf(buf, PATH_MAX, "%i x %i",
(b->client.w - b->client.base.w) / b->client.step.w,
(b->client.h - b->client.base.h) / b->client.step.h);
}
else
{
sprintf(buf, "%i x %i",
snprintf(buf, PATH_MAX, "%i x %i",
b->client.w,
b->client.h);
}

34
src/config.c
View File

@ -49,7 +49,7 @@ e_config_get(char *type)
if (!strcmp(type, _key)) \
{ \
if ((_var)[0]) D_RETURN_(_var); \
sprintf((_var), ## _args); \
snprintf((_var), PATH_MAX, ## _args); \
D_RETURN_(_var); \
} \
}
@ -100,25 +100,25 @@ e_config_init(void)
#if 1 /* for now don't do this. i think a cp -r will be needed later anyway */
if (!e_file_is_dir(e_config_user_dir())) e_file_mkdir(e_config_user_dir());
sprintf(buf, "%sappearance", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sappearance", e_config_user_dir());
if (!e_file_is_dir(buf)) e_file_mkdir(buf);
sprintf(buf, "%sappearance/borders", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sappearance/borders", e_config_user_dir());
if (!e_file_is_dir(buf)) e_file_mkdir(buf);
sprintf(buf, "%sbehavior", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sbehavior", e_config_user_dir());
if (!e_file_is_dir(buf)) e_file_mkdir(buf);
sprintf(buf, "%sbehavior/grabs.db", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sbehavior/grabs.db", e_config_user_dir());
if (!e_file_exists(buf))
e_file_cp(PACKAGE_DATA_DIR"/data/config/behavior/default/grabs.db", buf);
sprintf(buf, "%sbehavior/settings.db", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sbehavior/settings.db", e_config_user_dir());
if (!e_file_exists(buf))
e_file_cp(PACKAGE_DATA_DIR"/data/config/behavior/default/settings.db", buf);
sprintf(buf, "%sbehavior/actions.db", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sbehavior/actions.db", e_config_user_dir());
if (!e_file_exists(buf))
e_file_cp(PACKAGE_DATA_DIR"/data/config/behavior/default/actions.db", buf);
sprintf(buf, "%sbehavior/apps_menu.db", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sbehavior/apps_menu.db", e_config_user_dir());
if (!e_file_exists(buf))
e_file_cp(PACKAGE_DATA_DIR"/data/config/behavior/default/apps_menu.db", buf);
sprintf(buf, "%sappearance/borders/border.bits.db", e_config_user_dir());
snprintf(buf, PATH_MAX, "%sappearance/borders/border.bits.db", e_config_user_dir());
#endif
#if 0
ts();
@ -164,9 +164,9 @@ e_config_user_dir(void)
if (cfg_user_dir[0]) D_RETURN_(cfg_user_dir);
if (cfg_root[0]) D_RETURN_(cfg_root);
#if 1 /* disabled for now - use system ones only */
sprintf(cfg_user_dir, "%s/.e/", e_util_get_user_home());
snprintf(cfg_user_dir, PATH_MAX, "%s/.e/", e_util_get_user_home());
#else
sprintf(cfg_user_dir, PACKAGE_DATA_DIR"/data/config/");
snprintf(cfg_user_dir, PATH_MAX, PACKAGE_DATA_DIR"/data/config/");
#endif
D_RETURN_(cfg_user_dir);
@ -291,7 +291,7 @@ e_config_load(char *file, char *prefix, E_Config_Base_Type *type)
int val;
val = 0;
sprintf(buf, "%s/%s", prefix, node->prefix);
snprintf(buf, PATH_MAX, "%s/%s", prefix, node->prefix);
if (e_db_int_get(db, buf, &val))
(*((int *)(&(data[node->offset])))) = val;
else
@ -302,7 +302,7 @@ e_config_load(char *file, char *prefix, E_Config_Base_Type *type)
{
char *val;
sprintf(buf, "%s/%s", prefix, node->prefix);
snprintf(buf, PATH_MAX, "%s/%s", prefix, node->prefix);
if ((val = e_db_str_get(db, buf)))
(*((char **)(&(data[node->offset])))) = val;
else
@ -314,7 +314,7 @@ e_config_load(char *file, char *prefix, E_Config_Base_Type *type)
float val;
val = 0;
sprintf(buf, "%s/%s", prefix, node->prefix);
snprintf(buf, PATH_MAX, "%s/%s", prefix, node->prefix);
if (e_db_float_get(db, buf, &val))
(*((float *)(&(data[node->offset])))) = val;
else
@ -327,14 +327,14 @@ e_config_load(char *file, char *prefix, E_Config_Base_Type *type)
int i, count;
l2 = NULL;
sprintf(buf, "%s/%s/count", prefix, node->prefix);
snprintf(buf, PATH_MAX, "%s/%s/count", prefix, node->prefix);
count = 0;
e_db_int_get(db, buf, &count);
for (i = 0; i < count; i++)
{
void *data2;
sprintf(buf, "%s/%s/%i", prefix, node->prefix, i);
snprintf(buf, PATH_MAX, "%s/%s/%i", prefix, node->prefix, i);
data2 = e_config_load(file, buf, node->sub_type);
l2 = evas_list_append(l2, data2);
}
@ -343,7 +343,7 @@ e_config_load(char *file, char *prefix, E_Config_Base_Type *type)
break;
case E_CFG_TYPE_KEY:
{
sprintf(buf, "%s/%s", prefix, node->prefix);
snprintf(buf, PATH_MAX, "%s/%s", prefix, node->prefix);
(*((char **)(&(data[node->offset])))) = strdup(buf);
}
break;

6
src/cursors.c
View File

@ -73,7 +73,7 @@ e_cursors_find(char *type)
{
char buf[PATH_MAX];
sprintf(buf, "%s/%s.db", e_config_get("cursors"), type);
snprintf(buf, PATH_MAX, "%s/%s.db", e_config_get("cursors"), type);
if (e_file_mod_time(buf) > c->mod)
{
cursors = evas_list_remove(cursors, c);
@ -113,11 +113,11 @@ e_cursors_display_in_window(Window win, char *type)
e_strdup(c->type, type);
sprintf(buf, "%s/%s.db", e_config_get("cursors"), type);
snprintf(buf, PATH_MAX, "%s/%s.db", e_config_get("cursors"), type);
c->mod = e_file_mod_time(buf);
E_DB_INT_GET(buf, "/cursor/x", hx, ok);
E_DB_INT_GET(buf, "/cursor/y", hy, ok);
sprintf(buf, "%s/%s.db:/cursor/image", e_config_get("cursors"), type);
snprintf(buf, PATH_MAX, "%s/%s.db:/cursor/image", e_config_get("cursors"), type);
im = imlib_load_image(buf);
if (im)
{

8
src/delayed.c
View File

@ -38,12 +38,12 @@ e_delayed_action_new(E_Event_Type event,
void
e_delayed_action_start(E_Observer *obs, E_Observee *obj)
{
char event_name[1024];
char event_name[PATH_MAX];
E_Delayed_Action *eda = (E_Delayed_Action*) obs;
D_ENTER;
snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", obs->event);
snprintf(event_name, PATH_MAX, "_e_delayed_action_notify(%d)", obs->event);
ecore_add_event_timer(event_name, eda->delay, eda->delay_func, 0, obj);
D_RETURN;
@ -53,11 +53,11 @@ e_delayed_action_start(E_Observer *obs, E_Observee *obj)
void
e_delayed_action_cancel(E_Delayed_Action *eda)
{
char event_name[1024];
char event_name[PATH_MAX];
D_ENTER;
snprintf(event_name, 1024, "_e_delayed_action_notify(%d)", E_OBSERVER(eda)->event);
snprintf(event_name, PATH_MAX, "_e_delayed_action_notify(%d)", E_OBSERVER(eda)->event);
ecore_del_event_timer(event_name);
D_RETURN;

2
src/desktops.c
View File

@ -204,7 +204,7 @@ e_desktops_init_file_display(E_Desktop *desk)
/* uncomment this and comment out the next line for some tress testing */
/* e_strdup(v->dir, "/dev"); */
/* e_strdup(v->dir, e_file_home()); */
sprintf(buf, "%s/desktop/default", e_config_user_dir());
snprintf(buf, PATH_MAX, "%s/desktop/default", e_config_user_dir());
e_strdup(v->dir, buf);
e_view_bg_load(v);

2
src/e_ferite.fec
View File

@ -627,7 +627,7 @@ class Epplet
char buf[PATH_MAX], *retval;
printf("getting dir:\n");
sprintf(buf, "%s%s/", e_config_get("epplets"), EppObj->name);
snprintf(buf, PATH_MAX, "%s%s/", e_config_get("epplets"), EppObj->name);
printf("%s\n", buf);
retval = (char *)buf;
FE_RETURN_STR(retval, 0);

6
src/entry.c
View File

@ -227,21 +227,21 @@ e_entry_realize(E_Entry *entry)
D_ENTER;
entries = e_config_get("entries");
sprintf(buf, "%s/%s", entries, "base.bits.db");
snprintf(buf, PATH_MAX, "%s/%s", entries, "base.bits.db");
entry->obj_base = ebits_load(buf);
if (entry->obj_base)
{
ebits_add_to_evas(entry->obj_base, entry->evas);
/* ebits_set_color_class(entry->obj_base, "Base FG", 100, 200, 255, 255);*/
}
sprintf(buf, "%s/%s", entries, "cursor.bits.db");
snprintf(buf, PATH_MAX, "%s/%s", entries, "cursor.bits.db");
entry->obj_cursor = ebits_load(buf);
if (entry->obj_cursor)
{
ebits_add_to_evas(entry->obj_cursor, entry->evas);
/* ebits_set_color_class(entry->obj_base, "Base FG", 100, 200, 255, 255);*/
}
sprintf(buf, "%s/%s", entries, "selection.bits.db");
snprintf(buf, PATH_MAX, "%s/%s", entries, "selection.bits.db");
entry->obj_selection = ebits_load(buf);
if (entry->obj_selection)
{

6
src/exec.c
View File

@ -180,13 +180,13 @@ e_exec_in_dir_with_env(char *exe, char *dir, int *launch_id_ret, char **env, cha
/* have this launch Id number set on them - as well as process ID */
/* machine name, and user name */
if (launch_path) e_util_set_env("E_HACK_LAUNCH_PATH", launch_path);
sprintf(preload_paths, "E_HACK_LAUNCH_ID=%i LD_PRELOAD_PATH='%s'",
snprintf(preload_paths, PATH_MAX, "E_HACK_LAUNCH_ID=%i LD_PRELOAD_PATH='%s'",
launch_id, PACKAGE_LIB_DIR);
sprintf(preload, "LD_PRELOAD='libehack.so libX11.so libdl.so'");
snprintf(preload, PATH_MAX, "LD_PRELOAD='libehack.so libX11.so libdl.so'");
exe2 = malloc(strlen(exe) + 1 +
strlen(preload_paths) + 1 +
strlen(preload) + 1);
sprintf(exe2, "%s %s %s", preload_paths, preload, exe);
snprintf(exe2, PATH_MAX, "%s %s %s", preload_paths, preload, exe);
execl("/bin/sh", "/bin/sh", "-c", exe2, NULL);
exit(0);

2
src/guides.c
View File

@ -184,7 +184,7 @@ e_guides_update(void)
char *dir;
dir = e_config_get("guides");
sprintf(file, "%s/display.bits.db", dir);
snprintf(file, PATH_MAX, "%s/display.bits.db", dir);
guides.disp.bg = ebits_load(file);
if (guides.disp.bg)
{

30
src/iconbar.c
View File

@ -149,9 +149,9 @@ e_iconbar_cleanup(E_Iconbar *ib)
if ((ib->view) && (ib->view->evas) && (ib->clip))
evas_del_object(ib->view->evas, ib->clip);
/* delete any timers intended to work on this iconbar */
sprintf(buf, "iconbar_reload:%s", ib->view->dir);
snprintf(buf, PATH_MAX, "iconbar_reload:%s", ib->view->dir);
ecore_del_event_timer(buf);
sprintf(buf, "iconbar_scroll:%s", ib->view->dir);
snprintf(buf, PATH_MAX, "iconbar_scroll:%s", ib->view->dir);
ecore_del_event_timer(buf);
/* call the destructor of the base class */
@ -214,7 +214,7 @@ e_iconbar_new(E_View *v)
/* first we want to load the iconbar data itself - ie the config info */
/* for what icons we have and what they execute */
sprintf(buf, "%s/.e_iconbar.db", v->dir);
snprintf(buf, PATH_MAX, "%s/.e_iconbar.db", v->dir);
/* use the config system to simply load up the db and start making */
/* structs and lists and stuff for us... we told it how to in init */
ib = e_config_load(buf, "", cf_iconbar);
@ -260,7 +260,7 @@ e_iconbar_new(E_View *v)
/* now we need to load up a bits file that tells us where in the view the */
/* iconbar is meant to go. same place. just a slightly different name */
sprintf(buf, "%s/.e_iconbar.bits.db", v->dir);
snprintf(buf, PATH_MAX, "%s/.e_iconbar.bits.db", v->dir);
ib->bit = ebits_load(buf);
/* we didn't find one? */
if (!ib->bit)
@ -316,7 +316,7 @@ e_iconbar_icon_cleanup(E_Iconbar_Icon *ic)
{
char buf[PATH_MAX];
sprintf(buf, "iconbar_launch_wait:%i", ic->launch_id);
snprintf(buf, PATH_MAX, "iconbar_launch_wait:%i", ic->launch_id);
ecore_del_event_timer(buf);
ic->launch_id = 0;
}
@ -355,7 +355,7 @@ e_iconbar_realize(E_Iconbar *ib)
/* the path of the key to the image memebr - that is actually */
/* a lump of image data inlined in the iconbar db - so the icons */
/* themselves follow the iconbar wherever it goes */
sprintf(buf, "%s/.e_iconbar.db:%s", ib->view->dir, ic->image_path);
snprintf(buf, PATH_MAX, "%s/.e_iconbar.db:%s", ib->view->dir, ic->image_path);
/* add the icon image object */
ic->image = evas_add_image_from_file(ib->view->evas, buf);
/* clip the icon */
@ -615,7 +615,7 @@ e_iconbar_file_add(E_View *v, char *file)
char buf[PATH_MAX];
/* unique timer name */
sprintf(buf, "iconbar_reload:%s", v->dir);
snprintf(buf, PATH_MAX, "iconbar_reload:%s", v->dir);
/* if we've scrolled since. save */
if ((v->iconbar) &&
(v->iconbar->has_been_scrolled))
@ -674,7 +674,7 @@ e_iconbar_file_change(E_View *v, char *file)
char buf[PATH_MAX];
/* unique timer name */
sprintf(buf, "iconbar_reload:%s", v->dir);
snprintf(buf, PATH_MAX, "iconbar_reload:%s", v->dir);
/* if we've scrolled since. save */
if ((v->iconbar) &&
(v->iconbar->has_been_scrolled))
@ -699,7 +699,7 @@ e_iconbar_save_out_final(E_Iconbar *ib)
if (ib->view)
{
sprintf(buf, "%s/.e_iconbar.db", ib->view->dir);
snprintf(buf, PATH_MAX, "%s/.e_iconbar.db", ib->view->dir);
E_DB_FLOAT_SET(buf, "/scroll", ib->scroll);
}
}
@ -721,7 +721,7 @@ e_iconbar_handle_launch_id(Window win, void *data)
{
char buf[PATH_MAX];
sprintf(buf, "iconbar_launch_wait:%i", ic->launch_id);
snprintf(buf, PATH_MAX, "iconbar_launch_wait:%i", ic->launch_id);
ecore_del_event_timer(buf);
}
ic->launch_id = 0;
@ -777,7 +777,7 @@ ib_scroll_timeout(int val, void *data)
/* get our iconbar pointer */
ib = (E_Iconbar *)data;
sprintf(buf, "iconbar_scroll:%s", ib->view->dir);
snprintf(buf, PATH_MAX, "iconbar_scroll:%s", ib->view->dir);
if (val == 0)
ecore_del_event_timer(buf);
else
@ -836,7 +836,7 @@ ib_timeout(int val, void *data)
char buf[PATH_MAX];
/* figure out its path */
sprintf(buf, "%s/.e_iconbar.db:%s",
snprintf(buf, PATH_MAX, "%s/.e_iconbar.db:%s",
ic->iconbar->view->dir, ic->image_path);
/* add it */
ic->hi.image = evas_add_image_from_file(ic->iconbar->view->evas,
@ -1167,7 +1167,7 @@ ib_mouse_in(void *data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
char buf[PATH_MAX];
/* come up with a unique name for it */
sprintf(buf, "iconbar:%s/%s", ic->iconbar->view->dir, ic->image_path);
snprintf(buf, PATH_MAX, "iconbar:%s/%s", ic->iconbar->view->dir, ic->image_path);
e_strdup(ic->hi.timer, buf);
/* call the timeout */
ib_timeout(0, ic);
@ -1246,7 +1246,7 @@ ib_mouse_down(void *data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
ic->launch_id_cb =
e_exec_broadcast_cb_add(e_iconbar_handle_launch_id,
ic);
sprintf(buf, "iconbar_launch_wait:%i", ic->launch_id);
snprintf(buf, PATH_MAX, "iconbar_launch_wait:%i", ic->launch_id);
if (ic->wait_timeout > 0.0)
ecore_add_event_timer(buf, ic->wait_timeout,
ib_cancel_launch_timeout,
@ -1316,7 +1316,7 @@ ib_child_handle(Ecore_Event *ev)
{
char buf[PATH_MAX];
sprintf(buf, "iconbar_launch_wait:%i", ic->launch_id);
snprintf(buf, PATH_MAX, "iconbar_launch_wait:%i", ic->launch_id);
ecore_del_event_timer(buf);
}
ic->launch_id = 0;

28
src/icons.c
View File

@ -313,15 +313,15 @@ e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
}
if (ic->state.clicked)
{
sprintf(icon, "%s:/icon/clicked", ic->info.icon);
snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->info.icon);
}
else if (ic->state.selected)
{
sprintf(icon, "%s:/icon/selected", ic->info.icon);
snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->info.icon);
}
else
{
sprintf(icon, "%s:/icon/normal", ic->info.icon);
snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->info.icon);
}
im2 = imlib_load_image(icon);
if (im2)
@ -769,7 +769,7 @@ e_icon_set_mime(E_Icon *ic, char *base, char *mime)
}
do
{
sprintf(icon, "%s/data/icons/%s/%s.db", PACKAGE_DATA_DIR,
snprintf(icon, PATH_MAX, "%s/data/icons/%s/%s.db", PACKAGE_DATA_DIR,
ic->info.mime.base, type);
if (e_file_exists(icon))
{
@ -784,10 +784,10 @@ e_icon_set_mime(E_Icon *ic, char *base, char *mime)
{
if (!e_file_exists(icon))
{
sprintf(icon, "%s/data/icons/%s/default.db", PACKAGE_DATA_DIR,
snprintf(icon, PATH_MAX, "%s/data/icons/%s/default.db", PACKAGE_DATA_DIR,
ic->info.mime.base);
if (!e_file_exists(icon))
sprintf(icon, "%s/data/icons/unknown/default.db", PACKAGE_DATA_DIR);
snprintf(icon, PATH_MAX, "%s/data/icons/unknown/default.db", PACKAGE_DATA_DIR);
}
}
ic->info.icon = strdup(icon);
@ -839,15 +839,15 @@ e_icon_update_state(E_Icon *ic)
}
if (ic->state.clicked)
{
sprintf(icon, "%s:/icon/clicked", ic->info.icon);
snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->info.icon);
}
else if (ic->state.selected)
{
sprintf(icon, "%s:/icon/selected", ic->info.icon);
snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->info.icon);
}
else
{
sprintf(icon, "%s:/icon/normal", ic->info.icon);
snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->info.icon);
}
if ((ic->state.selected) &&
(!ic->obj.sel.under.icon) &&
@ -856,14 +856,14 @@ e_icon_update_state(E_Icon *ic)
char file[PATH_MAX];
/*
sprintf(file, "%s/file.bits.db", e_config_get("selections"));
snprintf(file, PATH_MAX, "%s/file.bits.db", e_config_get("selections"));
ic->obj.sel.over.icon = ebits_load(file);
sprintf(file, "%s/text.bits.db", e_config_get("selections"));
snprintf(file, PATH_MAX, "%s/text.bits.db", e_config_get("selections"));
ic->obj.sel.over.text = ebits_load(file);
*/
sprintf(file, "%s/file.bits.db", e_config_get("selections"));
snprintf(file, PATH_MAX, "%s/file.bits.db", e_config_get("selections"));
ic->obj.sel.under.icon = ebits_load(file);
sprintf(file, "%s/text.bits.db", e_config_get("selections"));
snprintf(file, PATH_MAX, "%s/text.bits.db", e_config_get("selections"));
ic->obj.sel.under.text = ebits_load(file);
if (ic->obj.sel.under.icon)
{
@ -967,7 +967,7 @@ e_icon_exec(E_Icon *ic)
v->size.w = 400;
v->size.h = 300;
v->options.back_pixmap = 0;
sprintf(buf, "%s/%s", ic->view->dir, ic->file);
snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir, ic->file);
D("new dir >%s<\n", buf);
v->dir = strdup(buf);
e_view_bg_load(v);

54
src/match.c
View File

@ -13,35 +13,35 @@ e_match_set_props(E_Border *b)
if ((!b->client.name) || (!b->client.class)) D_RETURN;
db = e_db_open(e_config_get("match"));
sprintf(buf, "match/%s/%s/match", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/match", b->client.name, b->client.class);
ok = e_db_int_get(db, buf, &(b->client.matched.matched));
if (!ok)
{
e_db_close(db);
D_RETURN;
}
sprintf(buf, "match/%s/%s/prog_location/ignore", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/prog_location/ignore", b->client.name, b->client.class);
b->client.matched.prog_location.matched = e_db_int_get(db, buf, &(b->client.matched.prog_location.ignore));
sprintf(buf, "match/%s/%s/border/border", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/border/border", b->client.name, b->client.class);
b->client.matched.border.style = e_db_str_get(db, buf);
b->client.matched.border.matched = (int)b->client.matched.border.style;
sprintf(buf, "match/%s/%s/location/x", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/location/x", b->client.name, b->client.class);
b->client.matched.location.matched = e_db_int_get(db, buf, &(b->client.matched.location.x));
sprintf(buf, "match/%s/%s/location/y", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/location/y", b->client.name, b->client.class);
b->client.matched.location.matched = e_db_int_get(db, buf, &(b->client.matched.location.y));
sprintf(buf, "match/%s/%s/desk_area/x", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/desk_area/x", b->client.name, b->client.class);
b->client.matched.desk_area.matched = e_db_int_get(db, buf, &(b->client.matched.desk_area.x));
sprintf(buf, "match/%s/%s/desk_area/y", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/desk_area/y", b->client.name, b->client.class);
b->client.matched.desk_area.matched = e_db_int_get(db, buf, &(b->client.matched.desk_area.y));
sprintf(buf, "match/%s/%s/size/w", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/size/w", b->client.name, b->client.class);
b->client.matched.size.matched = e_db_int_get(db, buf, &(b->client.matched.size.w));
sprintf(buf, "match/%s/%s/size/h", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/size/h", b->client.name, b->client.class);
b->client.matched.size.matched = e_db_int_get(db, buf, &(b->client.matched.size.h));
sprintf(buf, "match/%s/%s/desktop/desk", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/desktop/desk", b->client.name, b->client.class);
b->client.matched.desktop.matched = e_db_int_get(db, buf, &(b->client.matched.desktop.desk));
sprintf(buf, "match/%s/%s/sticky/sticky", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/sticky/sticky", b->client.name, b->client.class);
b->client.matched.sticky.matched = e_db_int_get(db, buf, &(b->client.matched.sticky.sticky));
sprintf(buf, "match/%s/%s/layer/layer", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/layer/layer", b->client.name, b->client.class);
b->client.matched.layer.matched = e_db_int_get(db, buf, &(b->client.matched.layer.layer));
if (b->client.matched.prog_location.matched)
@ -108,23 +108,23 @@ e_match_save_props(E_Border *b)
db = e_db_open(e_config_get("match"));
if (!db) D_RETURN;
sprintf(buf, "match/%s/%s/match", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/match", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.matched);
if (b->client.matched.location.matched)
{
b->client.matched.location.x = b->current.x;
b->client.matched.location.y = b->current.y;
sprintf(buf, "match/%s/%s/location/x", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/location/x", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.location.x);
sprintf(buf, "match/%s/%s/location/y", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/location/y", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.location.y);
}
else
{
sprintf(buf, "match/%s/%s/location/x", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/location/x", b->client.name, b->client.class);
e_db_data_del(db, buf);
sprintf(buf, "match/%s/%s/location/y", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/location/y", b->client.name, b->client.class);
e_db_data_del(db, buf);
}
@ -132,51 +132,51 @@ e_match_save_props(E_Border *b)
{
b->client.matched.size.w = b->client.w;
b->client.matched.size.h = b->client.h;
sprintf(buf, "match/%s/%s/size/w", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/size/w", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.size.w);
sprintf(buf, "match/%s/%s/size/h", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/size/h", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.size.h);
}
else
{
sprintf(buf, "match/%s/%s/size/w", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/size/w", b->client.name, b->client.class);
e_db_data_del(db, buf);
sprintf(buf, "match/%s/%s/size/h", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/size/h", b->client.name, b->client.class);
e_db_data_del(db, buf);
}
if (b->client.matched.desktop.matched)
{
b->client.matched.desktop.desk = b->client.desk;
sprintf(buf, "match/%s/%s/desktop/desk", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/desktop/desk", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.desktop.desk);
}
else
{
sprintf(buf, "match/%s/%s/desktop/desk", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/desktop/desk", b->client.name, b->client.class);
e_db_data_del(db, buf);
}
if (b->client.matched.sticky.matched)
{
b->client.matched.sticky.sticky = b->client.sticky;
sprintf(buf, "match/%s/%s/sticky/sticky", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/sticky/sticky", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.sticky.sticky);
}
else
{
sprintf(buf, "match/%s/%s/sticky/sticky", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/sticky/sticky", b->client.name, b->client.class);
e_db_data_del(db, buf);
}
if (b->client.matched.prog_location.matched)
{
sprintf(buf, "match/%s/%s/prog_location/ignore", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/prog_location/ignore", b->client.name, b->client.class);
e_db_int_set(db, buf, b->client.matched.prog_location.ignore);
}
else
{
sprintf(buf, "match/%s/%s/prog_location/ignore", b->client.name, b->client.class);
snprintf(buf, PATH_MAX, "match/%s/%s/prog_location/ignore", b->client.name, b->client.class);
e_db_data_del(db, buf);
}

10
src/menu.c
View File

@ -987,7 +987,7 @@ e_menu_set_background(E_Menu *m)
menus = e_config_get("menus");
part = "base.bits.db";
sprintf(buf, "%s%s", menus, part);
snprintf(buf, PATH_MAX, "%s%s", menus, part);
if ((m->bg_file) && (!strcmp(m->bg_file, buf))) D_RETURN;
IF_FREE(m->bg_file);
@ -1033,7 +1033,7 @@ e_menu_set_sel(E_Menu *m, E_Menu_Item *mi)
{
selected = mi->selected;
if (mi->submenu) has_sub = 1;
sprintf(buf, "%sselected-%i.submenu-%i.bits.db", menus,
snprintf(buf, PATH_MAX, "%sselected-%i.submenu-%i.bits.db", menus,
selected, has_sub);
if ((mi->bg_file) && (!strcmp(mi->bg_file, buf))) D_RETURN;
}
@ -1074,7 +1074,7 @@ e_menu_set_sep(E_Menu *m, E_Menu_Item *mi)
D_ENTER;
menus = e_config_get("menus");
sprintf(buf, "%sseparator.bits.db", menus);
snprintf(buf, PATH_MAX, "%sseparator.bits.db", menus);
if ((mi->sep_file) && (!strcmp(mi->sep_file, buf))) D_RETURN;
IF_FREE(mi->sep_file);
@ -1115,9 +1115,9 @@ e_menu_set_state(E_Menu *m, E_Menu_Item *mi)
menus = e_config_get("menus");
on = mi->on;
if (mi->check)
sprintf(buf, "%scheck-%i.bits.db", menus, on);
snprintf(buf, PATH_MAX, "%scheck-%i.bits.db", menus, on);
else
sprintf(buf, "%sradio-%i.bits.db", menus, on);
snprintf(buf, PATH_MAX, "%sradio-%i.bits.db", menus, on);
if ((mi->state_file) && (!strcmp(mi->state_file, buf))) D_RETURN;
IF_FREE(mi->state_file);

24
src/menubuild.c
View File

@ -186,7 +186,7 @@ e_build_menu_db_build_number(E_Build_Menu *bm, E_DB_File *db, int num)
D_ENTER;
sprintf(buf, "/menu/%i/count", num);
snprintf(buf, PATH_MAX, "/menu/%i/count", num);
if (!e_db_int_get(db, buf, &num2)) D_RETURN_(NULL);
menu = e_menu_new();
e_menu_set_padding_icon(menu, 2);
@ -197,18 +197,18 @@ e_build_menu_db_build_number(E_Build_Menu *bm, E_DB_File *db, int num)
char *text, *icon, *exe, *script;
int ok, sub, sep;
sprintf(buf, "/menu/%i/%i/text", num, i2);
snprintf(buf, PATH_MAX, "/menu/%i/%i/text", num, i2);
text = e_db_str_get(db, buf);
sprintf(buf, "/menu/%i/%i/icon", num, i2);
snprintf(buf, PATH_MAX, "/menu/%i/%i/icon", num, i2);
icon = e_db_str_get(db, buf);
sprintf(buf, "/menu/%i/%i/command", num, i2);
snprintf(buf, PATH_MAX, "/menu/%i/%i/command", num, i2);
exe = e_db_str_get(db, buf);
sprintf(buf, "/menu/%i/%i/script", num, i2);
snprintf(buf, PATH_MAX, "/menu/%i/%i/script", num, i2);
script = e_db_str_get(db, buf);
sprintf(buf, "/menu/%i/%i/submenu", num, i2);
snprintf(buf, PATH_MAX, "/menu/%i/%i/submenu", num, i2);
ok = e_db_int_get(db, buf, &sub);
sep = 0;
sprintf(buf, "/menu/%i/%i/separator", num, i2);
snprintf(buf, PATH_MAX, "/menu/%i/%i/separator", num, i2);
e_db_int_get(db, buf, &sep);
menuitem = e_menu_item_new(text);
e_menu_item_set_icon(menuitem, icon);
@ -285,7 +285,7 @@ e_build_menu_gnome_apps_build_dir(E_Build_Menu *bm, char *dir)
Evas_List dirlist = NULL;
/* read .order file */
sprintf(buf, "%s/.order", dir);
snprintf(buf, PATH_MAX, "%s/.order", dir);
f = fopen(buf, "rb");
if (f)
{
@ -348,19 +348,19 @@ e_build_menu_gnome_apps_build_dir(E_Build_Menu *bm, char *dir)
name = NULL;
sub = NULL;
s = l->data;
sprintf(buf, "%s/%s", dir, s);
snprintf(buf, PATH_MAX, "%s/%s", dir, s);
/* if its a subdir... */
if (e_file_is_dir(buf))
{
sub = e_build_menu_gnome_apps_build_dir(bm, buf);
sprintf(buf, "%s/%s/.directory", dir, s);
snprintf(buf, PATH_MAX, "%s/%s/.directory", dir, s);
f = fopen(buf, "rb");
}
/* regular file */
else if (e_file_exists(buf))
{
sprintf(buf, "%s/%s", dir, s);
snprintf(buf, PATH_MAX, "%s/%s", dir, s);
f = fopen(buf, "rb");
}
@ -399,7 +399,7 @@ e_build_menu_gnome_apps_build_dir(E_Build_Menu *bm, char *dir)
{
char buf2[PATH_MAX];
sprintf(buf2, "/usr/share/pixmaps/%s", eq +1);
snprintf(buf, PATH_MAX, "/usr/share/pixmaps/%s", eq +1);
icon = strdup(buf2);
}
}

24
src/scrollbar.c
View File

@ -71,16 +71,16 @@ e_scrollbar_setup_bits(E_Scrollbar *sb)
if (sb->direction == 1)
{
sprintf(buf, "%s/scroll_base_v.bits.db", e_config_get("scrollbars"));
snprintf(buf, PATH_MAX, "%s/scroll_base_v.bits.db", e_config_get("scrollbars"));
sb->base = ebits_load(buf);
sprintf(buf, "%s/scroll_bar_v.bits.db", e_config_get("scrollbars"));
snprintf(buf, PATH_MAX, "%s/scroll_bar_v.bits.db", e_config_get("scrollbars"));
sb->bar = ebits_load(buf);
}
else
{
sprintf(buf, "%s/scroll_base_h.bits.db", e_config_get("scrollbars"));
snprintf(buf, PATH_MAX, "%s/scroll_base_h.bits.db", e_config_get("scrollbars"));
sb->base = ebits_load(buf);
sprintf(buf, "%s/scroll_bar_h.bits.db", e_config_get("scrollbars"));
snprintf(buf, PATH_MAX, "%s/scroll_bar_h.bits.db", e_config_get("scrollbars"));
sb->bar = ebits_load(buf);
}
if (sb->base)
@ -128,14 +128,14 @@ e_sb_base_down_cb(void *data, Ebits_Object o, char *class, int bt, int x, int y,
{
sb->scrolling_up = 1;
sprintf(name, "scroll_up.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir);
ecore_add_event_timer(name, 0.01, e_sb_scroll_timer, 0, sb);
}
else if (!strcmp(class, "Scrollbar_Arrow2"))
{
sb->scrolling_down = 1;
sprintf(name, "scroll_down.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir);
ecore_add_event_timer(name, 0.01, e_sb_scroll_timer, 0, sb);
}
else if (!strcmp(class, "Scrollbar_Trough"))
@ -180,14 +180,14 @@ e_sb_base_up_cb(void *data, Ebits_Object o, char *class, int bt, int x, int y, i
{
sb->scrolling_up = 0;
sprintf(name, "scroll_up.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir);
ecore_del_event_timer(name);
}
else if (!strcmp(class, "Scrollbar_Arrow2"))
{
sb->scrolling_down = 0;
sprintf(name, "scroll_down.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir);
ecore_del_event_timer(name);
}
else if (!strcmp(class, "Scrollbar_Trough"))
@ -318,7 +318,7 @@ e_sb_scroll_timer(int val, void *data)
sb->val -= 16;
if (sb->val < 0) sb->val = 0;
sprintf(name, "scroll_up.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir);
ecore_add_event_timer(name, 0.01, e_sb_scroll_timer, 0, sb);
}
@ -327,7 +327,7 @@ e_sb_scroll_timer(int val, void *data)
sb->val += 16;
if ((sb->val + sb->range) > sb->max) sb->val = sb->max - sb->range;
sprintf(name, "scroll_down.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir);
ecore_add_event_timer(name, 0.01, e_sb_scroll_timer, 0, sb);
}
@ -376,9 +376,9 @@ e_scrollbar_cleanup(E_Scrollbar *sb)
}
IF_FREE(sb->dir);
sprintf(name, "scroll_up.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir);
ecore_del_event_timer(name);
sprintf(name, "scroll_down.%i.%s", sb->direction, sb->dir);
snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir);
ecore_del_event_timer(name);
e_object_cleanup(E_OBJECT(sb));

2
src/util.c
View File

@ -8,7 +8,7 @@ e_util_set_env(char *variable, char *content)
D_ENTER;
sprintf(env, "%s=%s", variable, content);
snprintf(env, PATH_MAX, "%s=%s", variable, content);
putenv(env);
D_RETURN;

42
src/view.c
View File

@ -80,7 +80,7 @@ e_view_write_icon_xy_timeout(int val, void *data)
char buf[PATH_MAX];
ic->q.write_xy = 0;
sprintf(buf, "%s/%s", ic->view->dir, ic->file);
snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir, ic->file);
D("write meta xy for icon for file %s\n", ic->file);
efsd_set_metadata_int(e_fs_get_connection(),
@ -94,7 +94,7 @@ e_view_write_icon_xy_timeout(int val, void *data)
{
char name[PATH_MAX];
sprintf(name, "icon_xy_record.%s", v->dir);
snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir);
ecore_add_event_timer(name, 0.01, e_view_write_icon_xy_timeout, 0, v);
D_RETURN;
}
@ -848,7 +848,7 @@ e_view_queue_geometry_record(E_View *v)
D_ENTER;
sprintf(name, "geometry_record.%s", v->dir);
snprintf(name, PATH_MAX, "geometry_record.%s", v->dir);
ecore_add_event_timer(name, 0.10, e_view_geometry_record_timeout, 0, v);
D_RETURN;
@ -861,7 +861,7 @@ e_view_queue_icon_xy_record(E_View *v)
D_ENTER;
sprintf(name, "icon_xy_record.%s", v->dir);
snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir);
ecore_add_event_timer(name, 0.10, e_view_write_icon_xy_timeout, 0, v);
D_RETURN;
@ -1601,7 +1601,7 @@ e_view_queue_resort(E_View *v)
if (v->have_resort_queued) D_RETURN;
v->have_resort_queued = 1;
sprintf(name, "resort_timer.%s", v->dir);
snprintf(name, PATH_MAX, "resort_timer.%s", v->dir);
ecore_add_event_timer(name, 1.0, e_view_resort_timeout, 0, v);
D_RETURN;
@ -1793,11 +1793,11 @@ e_view_cleanup(E_View *v)
if (v->scrollbar.h) e_object_unref(E_OBJECT(v->scrollbar.h));
if (v->scrollbar.v) e_object_unref(E_OBJECT(v->scrollbar.v));
sprintf(name, "resort_timer.%s", v->dir);
snprintf(name, PATH_MAX, "resort_timer.%s", v->dir);
ecore_del_event_timer(name);
sprintf(name, "geometry_record.%s", v->dir);
snprintf(name, PATH_MAX, "geometry_record.%s", v->dir);
ecore_del_event_timer(name);
sprintf(name, "icon_xy_record.%s", v->dir);
snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir);
ecore_del_event_timer(name);
views = evas_list_remove(views, v);
@ -2393,7 +2393,7 @@ e_view_handle_fs(EfsdEvent *ev)
IF_FREE(v->bg_file);
e_strdup(v->bg_file, efsd_metadata_get_str(ev));
sprintf(buf, "background_reload:%s", v->dir);
snprintf(buf, PATH_MAX, "background_reload:%s", v->dir);
ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v);
}
}
@ -2465,7 +2465,7 @@ e_view_bg_load(E_View *v)
/* relative path for bg_file ? */
if ((v->bg_file[0] != '/'))
{
sprintf(buf, "%s/%s", v->dir, v->bg_file);
snprintf(buf, PATH_MAX, "%s/%s", v->dir, v->bg_file);
FREE(v->bg_file);
e_strdup(v->bg_file, buf);
}
@ -2473,16 +2473,16 @@ e_view_bg_load(E_View *v)
bg = e_background_load(v->bg_file);
if (!bg)
{
sprintf(buf, "%s/.e_background.bg.db", v->dir);
snprintf(buf, PATH_MAX, "%s/.e_background.bg.db", v->dir);
FREE(v->bg_file);
e_strdup(v->bg_file, buf);
bg = e_background_load(v->bg_file);
if (!bg)
{
if (v->is_desktop)
sprintf(buf, "%s/default.bg.db", e_config_get("backgrounds"));
snprintf(buf, PATH_MAX, "%s/default.bg.db", e_config_get("backgrounds"));
else
sprintf(buf, "%s/view.bg.db", e_config_get("backgrounds"));
snprintf(buf, PATH_MAX, "%s/view.bg.db", e_config_get("backgrounds"));
FREE(v->bg_file);
e_strdup(v->bg_file, buf);
bg = e_background_load(v->bg_file);
@ -2554,7 +2554,7 @@ e_view_bg_change(E_View *v, char *file)
D_ENTER;
if (!(!strcmp(file, ".e_background.bg.db"))) return;
sprintf(buf, "background_reload:%s", v->dir);
snprintf(buf, PATH_MAX, "background_reload:%s", v->dir);
ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v);
D_RETURN;
@ -2568,11 +2568,11 @@ e_view_bg_add(E_View *v, char *file)
D_ENTER;
if (!(!strcmp(file, ".e_background.bg.db"))) return;
sprintf(buf, "%s/%s", v->dir, file);
snprintf(buf, PATH_MAX, "%s/%s", v->dir, file);
if (!strcmp(buf, v->bg_file)) D_RETURN;
IF_FREE(v->bg_file);
e_strdup(v->bg_file, "");
sprintf(buf, "background_reload:%s", v->dir);
snprintf(buf, PATH_MAX, "background_reload:%s", v->dir);
ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v);
D_RETURN;
@ -2694,11 +2694,11 @@ e_dnd_data_request(Ecore_Event * ev)
if (first)
{
sprintf(buf, "file:%s/%s", v->dir, ic->file);
snprintf(buf, PATH_MAX, "file:%s/%s", v->dir, ic->file);
first = 0;
}
else
sprintf(buf, "\r\nfile:%s/%s", v->dir, ic->file);
snprintf(buf, PATH_MAX, "\r\nfile:%s/%s", v->dir, ic->file);
REALLOC(data, char, strlen(data) + strlen(buf) + 1);
strcat(data, buf);
}
@ -2723,11 +2723,11 @@ e_dnd_data_request(Ecore_Event * ev)
if (first)
{
sprintf(buf, "%s/%s\n", v->dir, ic->file);
snprintf(buf, PATH_MAX, "%s/%s\n", v->dir, ic->file);
first = 0;
}
else
sprintf(buf, "\n%s/%s", v->dir, ic->file);
snprintf(buf, PATH_MAX, "\n%s/%s", v->dir, ic->file);
REALLOC(data, char, strlen(data) + strlen(buf) + 1);
strcat(data, buf);
}
@ -2751,7 +2751,7 @@ e_dnd_data_request(Ecore_Event * ev)
{
char buf[16384];
sprintf(buf, "file:%s/%s", v->dir, ic->file);
snprintf(buf, PATH_MAX, "file:%s/%s", v->dir, ic->file);
data = strdup(buf);
break;
}