From: <enl...@li...> - 2002-02-28 06:10:35
|
Enlightenment CVS committal Author : term Project : e17 Module : libs/ebg Dir : e17/libs/ebg/debian Log Message: Directory /cvsroot/enlightenment/e17/libs/ebg/debian added to the repository |
From: <enl...@li...> - 2002-02-28 06:11:15
|
Enlightenment CVS committal Author : term Project : e17 Module : libs/ebg Dir : e17/libs/ebg Added Files: AUTHORS ChangeLog NEWS README Log Message: Add debianizing support. Tack on some administrative files to make it happy. |
From: <enl...@li...> - 2002-02-28 06:11:15
|
Enlightenment CVS committal Author : term Project : e17 Module : libs/ebg Dir : e17/libs/ebg/debian Added Files: Makefile.am changelog control copyright libebg0.postinst rules Log Message: Add debianizing support. Tack on some administrative files to make it happy. |
From: <enl...@li...> - 2002-02-28 21:14:05
|
Enlightenment CVS committal Author : term Project : e17 Module : libs/ebg Dir : e17/libs/ebg/test Modified Files: e_bg_test.c Log Message: Security patch from vac <kkuehl at cisco.com>, with a small improvement. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebg/test/e_bg_test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_bg_test.c 23 Jan 2002 06:27:50 -0000 1.3 +++ e_bg_test.c 28 Feb 2002 21:14:02 -0000 1.4 @@ -12,6 +12,9 @@ #define WINDOW_MIN_W 150 #define WINDOW_MIN_H 150 +#define EBG_MESSAGE_SIZE 256 +#define EBG_BUF_SIZE 1024 + /* evas options */ #define FNTDIR "./fnt" #define IMAGE_CACHE_IN_MB 4 @@ -140,7 +143,7 @@ static void bg_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { - char message[256]; + char message[EBG_MESSAGE_SIZE]; if(_b == 1) { @@ -157,7 +160,7 @@ { e_bg_set_layer(bg, --current_layer); } - sprintf(message, "Bg is at Layer %d", current_layer); + snprintf(message, EBG_MESSAGE_SIZE, "Bg is at Layer %d", current_layer); evas_set_text(evas, ot, message); if(current_stack_req) e_bg_stack_object_above(bg, ot); @@ -168,7 +171,7 @@ void try_bg_load_next() { - char buf[1024]; + char buf[EBG_BUF_SIZE]; if(bg) e_bg_free(bg); if(bg_current) bg_current = bg_current->next; if(!bg_current) bg_current = bg_list; @@ -176,7 +179,7 @@ bg = e_bg_load((char*)bg_current->data); if(!bg) return; - sprintf(buf, "%s", (char*)bg_current->data); + snprintf(buf, EBG_BUF_SIZE, "%s", (char*)bg_current->data); ecore_window_set_title(main_win, buf); e_bg_add_to_evas(bg, evas); e_bg_callback_add(bg, CALLBACK_MOUSE_DOWN, bg_mouse_down, NULL); @@ -190,7 +193,7 @@ void try_bg_load_prev() { - char buf[1024]; + char buf[EBG_BUF_SIZE]; if(bg) e_bg_free(bg); if(bg_current) bg_current = bg_current->prev; if(!bg_current) bg_current = bg_list->last; @@ -198,7 +201,7 @@ bg = e_bg_load((char*)bg_current->data); if(!bg) return; - sprintf(buf, "%s", (char*)bg_current->data); + snprintf(buf, EBG_BUF_SIZE, "%s", (char*)bg_current->data); ecore_window_set_title(main_win, buf); e_bg_add_to_evas(bg, evas); e_bg_callback_add(bg, CALLBACK_MOUSE_DOWN, bg_mouse_down, NULL); @@ -215,7 +218,7 @@ { Window win, ewin; Evas_Object o; - char message[256]; + char message[EBG_MESSAGE_SIZE]; double tw, th; win_w = win_h = 400; @@ -238,8 +241,8 @@ main_win = win; evas = evas_new_all(ecore_display_get(), win, 0, 0, win_w, win_h, RENDER_METHOD_ALPHA_SOFTWARE, 215, - (FONT_CACHE_IN_MB * (1024 * 1024)), - (IMAGE_CACHE_IN_MB * (1024 * 1024)), + (FONT_CACHE_IN_MB * (EBG_BUF_SIZE * EBG_BUF_SIZE)), + (IMAGE_CACHE_IN_MB * (EBG_BUF_SIZE * EBG_BUF_SIZE)), FNTDIR); ewin = evas_get_window(evas); @@ -257,7 +260,7 @@ evas_show(evas, o); /* relative layer labels */ - sprintf(message, "Layer 4"); + snprintf(message, EBG_MESSAGE_SIZE, "%s", "Layer 4"); o = evas_add_text(evas, "arial", 12, message); evas_set_color(evas, o, 0,0,0,255); tw = evas_get_text_width(evas, o); @@ -268,7 +271,7 @@ evas_set_layer(evas, o, 4); ol = o; - sprintf(message, "Layer 8"); + snprintf(message, EBG_MESSAGE_SIZE, "%s", "Layer 8"); o = evas_add_text(evas, "arial", 12, message); evas_set_color(evas, o, 0,0,0,255); tw = evas_get_text_width(evas, o); @@ -279,7 +282,7 @@ evas_set_layer(evas, o, 8); ol2 = o; - sprintf(message, "Layer -2"); + snprintf(message, EBG_MESSAGE_SIZE, "%s", "Layer -2"); o = evas_add_text(evas, "arial", 12, message); evas_set_color(evas, o, 0,0,0,255); tw = evas_get_text_width(evas, o); @@ -290,7 +293,7 @@ evas_set_layer(evas, o, -2); ol3 = o; - sprintf(message, "Layer 12"); + snprintf(message, EBG_MESSAGE_SIZE, "%s", "Layer 12"); o = evas_add_text(evas, "arial", 12, message); evas_set_color(evas, o, 0,0,0,255); tw = evas_get_text_width(evas, o); @@ -303,7 +306,7 @@ /* layer text label */ - sprintf(message, "Bg is at Layer %d", current_layer); + snprintf(message, EBG_MESSAGE_SIZE, "Bg is at Layer %d", current_layer); ot = evas_add_text(evas, "arial", 16, message); evas_set_color(evas, ot, 192,192,192,255); tw = evas_get_text_width(evas, ot); |
From: <enl...@li...> - 2002-02-28 21:14:36
|
Enlightenment CVS committal Author : term Project : e17 Module : libs/ebg Dir : e17/libs/ebg/src Modified Files: Ebg.h e_bg.c Log Message: Security patch from vac <kkuehl at cisco.com>, with a small improvement. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebg/src/Ebg.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Ebg.h 25 Jan 2002 19:28:09 -0000 1.4 +++ Ebg.h 28 Feb 2002 21:14:01 -0000 1.5 @@ -7,6 +7,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> typedef struct _E_Background *E_Background; typedef struct _E_Background_Layer *E_Background_Layer; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebg/src/e_bg.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_bg.c 12 Feb 2002 04:19:38 -0000 1.7 +++ e_bg.c 28 Feb 2002 21:14:02 -0000 1.8 @@ -170,27 +170,27 @@ for (i = 0; i < num; i++) { E_Background_Layer bl; - char buf[4096]; + char buf[PATH_MAX]; bl = e_bg_layer_new(); bg->layers = evas_list_append(bg->layers, bl); - sprintf(buf, "/layers/%i/type", i); + snprintf(buf,PATH_MAX, "/layers/%i/type", i); e_db_int_get(db, buf, (int*)&(bl->type)); - sprintf(buf, "/layers/%i/inlined", i); + snprintf(buf, PATH_MAX,"/layers/%i/inlined", i); e_db_int_get(db, buf, &(bl->inlined)); - sprintf(buf, "/layers/%i/color_class", i); + snprintf(buf, PATH_MAX,"/layers/%i/color_class", i); bl->color_class = e_db_str_get(db, buf); if (bl->type == E_BACKGROUND_TYPE_IMAGE) { if (bl->inlined) { - sprintf(buf, "%s:/layers/%i/image", file, i); + snprintf(buf,PATH_MAX, "%s:/layers/%i/image", file, i); bl->file = strdup(buf); } else { - sprintf(buf, "/layers/%i/file", i); + snprintf(buf,PATH_MAX, "/layers/%i/file", i); bl->file = e_db_str_get(db, buf); } } @@ -201,82 +201,82 @@ { int gradient_count, n; - sprintf(buf, "/layers/%i/gradient/count", i); + snprintf(buf,PATH_MAX,"/layers/%i/gradient/count", i); e_db_int_get(db, buf, &gradient_count); - sprintf(buf, "/layers/%i/gradient/angle", i); + snprintf(buf, PATH_MAX,"/layers/%i/gradient/angle", i); e_db_float_get(db, buf, &(bl->gradient.angle)); for (n = 0; n < gradient_count; n++) { E_Background_Gradient g; g = e_bg_gradient_new(); - sprintf(buf, "/layers/%i/gradient/%i/r", i, n); + snprintf(buf, PATH_MAX,"/layers/%i/gradient/%i/r", i, n); e_db_int_get(db, buf, &(g->r)); - sprintf(buf, "/layers/%i/gradient/%i/g", i, n); + snprintf(buf, PATH_MAX,"/layers/%i/gradient/%i/g", i, n); e_db_int_get(db, buf, &(g->g)); - sprintf(buf, "/layers/%i/gradient/%i/b", i, n); + snprintf(buf,PATH_MAX,"/layers/%i/gradient/%i/b", i, n); e_db_int_get(db, buf, &(g->b)); - sprintf(buf, "/layers/%i/gradient/%i/a", i, n); + snprintf(buf, PATH_MAX,"/layers/%i/gradient/%i/a", i, n); e_db_int_get(db, buf, &(g->a)); - sprintf(buf, "/layers/%i/gradient/%i/distance", i, n); + snprintf(buf, PATH_MAX,"/layers/%i/gradient/%i/distance", i, n); e_db_int_get(db, buf, &(g->dist)); bl->gradient.colors = evas_list_append(bl->gradient.colors, g); } } } - sprintf(buf, "/layers/%i/fg.r", i); + snprintf(buf, PATH_MAX, "/layers/%i/fg.r", i); e_db_int_get(db, buf, &(bl->fg.r)); - sprintf(buf, "/layers/%i/fg.g", i); + snprintf(buf,PATH_MAX, "/layers/%i/fg.g", i); e_db_int_get(db, buf, &(bl->fg.g)); - sprintf(buf, "/layers/%i/fg.b", i); + snprintf(buf,PATH_MAX, "/layers/%i/fg.b", i); e_db_int_get(db, buf, &(bl->fg.b)); - sprintf(buf, "/layers/%i/fg.a", i); + snprintf(buf,PATH_MAX, "/layers/%i/fg.a", i); e_db_int_get(db, buf, &(bl->fg.a)); - sprintf(buf, "/layers/%i/bg.r", i); + snprintf(buf,PATH_MAX, "/layers/%i/bg.r", i); e_db_int_get(db, buf, &(bl->bg.r)); - sprintf(buf, "/layers/%i/bg.g", i); + snprintf(buf,PATH_MAX, "/layers/%i/bg.g", i); e_db_int_get(db, buf, &(bl->bg.g)); - sprintf(buf, "/layers/%i/bg.b", i); + snprintf(buf,PATH_MAX, "/layers/%i/bg.b", i); e_db_int_get(db, buf, &(bl->bg.b)); - sprintf(buf, "/layers/%i/bg.a", i); + snprintf(buf,PATH_MAX, "/layers/%i/bg.a", i); e_db_int_get(db, buf, &(bl->bg.a)); - sprintf(buf, "/layers/%i/scroll.x", i); + snprintf(buf,PATH_MAX,"/layers/%i/scroll.x", i); e_db_float_get(db, buf, &(bl->scroll.x)); - sprintf(buf, "/layers/%i/scroll.y", i); + snprintf(buf,PATH_MAX, "/layers/%i/scroll.y", i); e_db_float_get(db, buf, &(bl->scroll.y)); - sprintf(buf, "/layers/%i/pos.x", i); + snprintf(buf, PATH_MAX, "/layers/%i/pos.x", i); e_db_float_get(db, buf, &(bl->pos.x)); - sprintf(buf, "/layers/%i/pos.y", i); + snprintf(buf, PATH_MAX, "/layers/%i/pos.y", i); e_db_float_get(db, buf, &(bl->pos.y)); - sprintf(buf, "/layers/%i/size.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.w", i); e_db_float_get(db, buf, &(bl->size.w)); - sprintf(buf, "/layers/%i/size.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.h", i); e_db_float_get(db, buf, &(bl->size.h)); - sprintf(buf, "/layers/%i/size.orig.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.orig.w", i); e_db_int_get(db, buf, &(bl->size.orig.w)); - sprintf(buf, "/layers/%i/size.orig.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.orig.h", i); e_db_int_get(db, buf, &(bl->size.orig.h)); - sprintf(buf, "/layers/%i/size.absolute.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.absolute.w", i); e_db_int_get(db, buf, &(bl->size.absolute.w)); - sprintf(buf, "/layers/%i/size.absolute.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.absolute.h", i); e_db_int_get(db, buf, &(bl->size.absolute.h)); - sprintf(buf, "/layers/%i/fill.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.w", i); e_db_float_get(db, buf, &(bl->fill.w)); - sprintf(buf, "/layers/%i/fill.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.h", i); e_db_float_get(db, buf, &(bl->fill.h)); - sprintf(buf, "/layers/%i/fill.orig.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.orig.w", i); e_db_int_get(db, buf, &(bl->fill.orig.w)); - sprintf(buf, "/layers/%i/fill.orig.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.orig.h", i); e_db_int_get(db, buf, &(bl->fill.orig.h)); - sprintf(buf, "/layers/%i/abs.y", i); + snprintf(buf, PATH_MAX, "/layers/%i/abs.y", i); e_db_int_get(db, buf, &(bl->abs.y)); - sprintf(buf, "/layers/%i/abs.x", i); + snprintf(buf, PATH_MAX, "/layers/%i/abs.x", i); e_db_int_get(db, buf, &(bl->abs.x)); } e_db_close(db); @@ -308,66 +308,66 @@ { E_Background_Layer bl; int gradient_count = 0; - char buf[4096]; + char buf[PATH_MAX]; bl = l->data; - sprintf(buf, "/layers/%i/type", i); + snprintf(buf, PATH_MAX, "/layers/%i/type", i); e_db_int_set(db, buf, bl->type); - sprintf(buf, "/layers/%i/inlined", i); + snprintf(buf, PATH_MAX, "/layers/%i/inlined", i); e_db_int_set(db, buf, bl->inlined); - sprintf(buf, "/layers/%i/scroll.x", i); + snprintf(buf, PATH_MAX, "/layers/%i/scroll.x", i); e_db_float_set(db, buf, bl->scroll.x); - sprintf(buf, "/layers/%i/scroll.y", i); + snprintf(buf, PATH_MAX, "/layers/%i/scroll.y", i); e_db_float_set(db, buf, bl->scroll.y); - sprintf(buf, "/layers/%i/pos.x", i); + snprintf(buf, PATH_MAX, "/layers/%i/pos.x", i); e_db_float_set(db, buf, bl->pos.x); - sprintf(buf, "/layers/%i/pos.y", i); + snprintf(buf, PATH_MAX, "/layers/%i/pos.y", i); e_db_float_set(db, buf, bl->pos.y); - sprintf(buf, "/layers/%i/size.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.w", i); e_db_float_set(db, buf, bl->size.w); - sprintf(buf, "/layers/%i/size.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.h", i); e_db_float_set(db, buf, bl->size.h); - sprintf(buf, "/layers/%i/size.orig.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.orig.w", i); e_db_int_set(db, buf, bl->size.orig.w); - sprintf(buf, "/layers/%i/size.orig.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.orig.h", i); e_db_int_set(db, buf, bl->size.orig.h); - sprintf(buf, "/layers/%i/size.absolute.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.absolute.w", i); e_db_int_set(db, buf, bl->size.absolute.w); - sprintf(buf, "/layers/%i/size.absolute.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/size.absolute.h", i); e_db_int_set(db, buf, bl->size.absolute.h); - sprintf(buf, "/layers/%i/fill.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.w", i); e_db_float_set(db, buf, bl->fill.w); - sprintf(buf, "/layers/%i/fill.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.h", i); e_db_float_set(db, buf, bl->fill.h); - sprintf(buf, "/layers/%i/fill.orig.w", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.orig.w", i); e_db_int_set(db, buf, bl->fill.orig.w); - sprintf(buf, "/layers/%i/fill.orig.h", i); + snprintf(buf, PATH_MAX, "/layers/%i/fill.orig.h", i); e_db_int_set(db, buf, bl->fill.orig.h); - sprintf(buf, "/layers/%i/fg.r", i); + snprintf(buf, PATH_MAX, "/layers/%i/fg.r", i); e_db_int_set(db, buf, bl->fg.r); - sprintf(buf, "/layers/%i/fg.g", i); + snprintf(buf, PATH_MAX, "/layers/%i/fg.g", i); e_db_int_set(db, buf, bl->fg.g); - sprintf(buf, "/layers/%i/fg.b", i); + snprintf(buf, PATH_MAX, "/layers/%i/fg.b", i); e_db_int_set(db, buf, bl->fg.b); - sprintf(buf, "/layers/%i/fg.a", i); + snprintf(buf, PATH_MAX, "/layers/%i/fg.a", i); e_db_int_set(db, buf, bl->fg.a); - sprintf(buf, "/layers/%i/bg.r", i); + snprintf(buf, PATH_MAX, "/layers/%i/bg.r", i); e_db_int_set(db, buf, bl->bg.r); - sprintf(buf, "/layers/%i/bg.g", i); + snprintf(buf, PATH_MAX, "/layers/%i/bg.g", i); e_db_int_set(db, buf, bl->bg.g); - sprintf(buf, "/layers/%i/bg.b", i); + snprintf(buf, PATH_MAX, "/layers/%i/bg.b", i); e_db_int_set(db, buf, bl->bg.b); - sprintf(buf, "/layers/%i/bg.a", i); + snprintf(buf, PATH_MAX, "/layers/%i/bg.a", i); e_db_int_set(db, buf, bl->bg.a); - sprintf(buf, "/layers/%i/abs.x", i); + snprintf(buf, PATH_MAX, "/layers/%i/abs.x", i); e_db_int_set(db, buf, bl->abs.x); - sprintf(buf, "/layers/%i/abs.y", i); + snprintf(buf, PATH_MAX, "/layers/%i/abs.y", i); e_db_int_set(db, buf, bl->abs.y); if (bl->type == E_BACKGROUND_TYPE_IMAGE) @@ -379,7 +379,7 @@ bl->image = imlib_load_image(bl->file); if (bl->image) { - sprintf(buf, "%s:/layers/%i/image", file, i); + snprintf(buf, PATH_MAX, "%s:/layers/%i/image", file, i); imlib_context_set_image(bl->image); imlib_image_set_format("db"); imlib_image_attach_data_value("compression", NULL, 9, NULL); @@ -388,13 +388,13 @@ } else if (bl->file) { - sprintf(buf, "/layers/%i/file", i); + snprintf(buf, PATH_MAX, "/layers/%i/file", i); e_db_str_set(db, buf, bl->file); } } if (bl->color_class) { - sprintf(buf, "/layers/%i/color_class", i); + snprintf(buf, PATH_MAX, "/layers/%i/color_class", i); e_db_str_set(db, buf, bl->color_class); } if (bl->type == E_BACKGROUND_TYPE_GRADIENT) @@ -402,24 +402,24 @@ Evas_List l; E_Background_Gradient g; - sprintf(buf, "/layers/%i/gradient/angle", i); + snprintf(buf, PATH_MAX, "/layers/%i/gradient/angle", i); e_db_float_set(db, buf, bl->gradient.angle); for (l = bl->gradient.colors; l; l = l->next, gradient_count++) { g = l->data; - sprintf(buf, "/layers/%i/gradient/%i/r", i, gradient_count); + snprintf(buf, PATH_MAX, "/layers/%i/gradient/%i/r", i, gradient_count); e_db_int_set(db, buf, g->r); - sprintf(buf, "/layers/%i/gradient/%i/g", i, gradient_count); + snprintf(buf, PATH_MAX, "/layers/%i/gradient/%i/g", i, gradient_count); e_db_int_set(db, buf, g->g); - sprintf(buf, "/layers/%i/gradient/%i/b", i, gradient_count); + snprintf(buf, PATH_MAX, "/layers/%i/gradient/%i/b", i, gradient_count); e_db_int_set(db, buf, g->b); - sprintf(buf, "/layers/%i/gradient/%i/a", i, gradient_count); + snprintf(buf, PATH_MAX, "/layers/%i/gradient/%i/a", i, gradient_count); e_db_int_set(db, buf, g->a); - sprintf(buf, "/layers/%i/gradient/%i/distance", i, + snprintf(buf, PATH_MAX, "/layers/%i/gradient/%i/distance", i, gradient_count); e_db_int_set(db, buf, g->dist); } - sprintf(buf, "/layers/%i/gradient/count", i); + snprintf(buf, PATH_MAX, "/layers/%i/gradient/count", i); e_db_int_set(db, buf, gradient_count); } } |
From: <enl...@li...> - 2002-08-06 17:51:16
|
Enlightenment CVS committal Author : term Project : e17 Module : libs/ebg Dir : e17/libs/ebg/debian Modified Files: changelog Log Message: Typo fix, found while using these files elsewhere :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebg/debian/changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- changelog 28 Feb 2002 06:11:14 -0000 1.1 +++ changelog 6 Aug 2002 17:51:14 -0000 1.2 @@ -2,4 +2,4 @@ * a CVS release - -- Lyle Kempler <te...@tw...> Thu, 28 Feb 2002 00:03:31 -0500 + -- Lyle Kempler <te...@tw...> Thu, 28 Feb 2002 00:03:31 -0500 |