From: <enl...@li...> - 2003-12-05 14:59:06
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Log Message: Directory /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config added to the repository |
From: <enl...@li...> - 2003-12-05 14:59:21
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config/ipc Log Message: Directory /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ipc added to the repository |
From: <enl...@li...> - 2003-12-05 15:02:18
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Added Files: Makefile.am Log Message: Added beginning of ecore_config the final location for proto/examine |
From: <enl...@li...> - 2003-12-05 15:02:48
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: acconfig.h configure.in Log Message: Added beginning of ecore_config the final location for proto/examine =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/acconfig.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- acconfig.h 9 Oct 2003 07:49:59 -0000 1.5 +++ acconfig.h 5 Dec 2003 15:02:17 -0000 1.6 @@ -10,3 +10,4 @@ #undef BUILD_ECORE_CON #undef BUILD_ECORE_IPC #undef BUILD_ECORE_TXT +#undef BUILD_ECORE_CONFIG =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- configure.in 29 Oct 2003 13:22:06 -0000 1.14 +++ configure.in 5 Dec 2003 15:02:17 -0000 1.15 @@ -338,6 +338,31 @@ AC_SUBST(ecore_txt_cflags) AC_SUBST(ecore_txt_libs) +AC_MSG_CHECKING(whether ecore_config module is to be built) + +ecore_config_cflags=""; +ecore_config_libs=""; + +AC_ARG_ENABLE(ecore-config, +[ --enable-ecore-config enable the ecore_config module], [ + if [ test "$enableval" = "yes" ]; then + AC_MSG_RESULT(yes) + AM_CONDITIONAL(BUILD_ECORE_CONFIG, test "$enableval" = "yes") + AC_DEFINE(BUILD_ECORE_CONFIG) + ecore_config_libs="-lecore_config"; + else + AC_MSG_RESULT(no) + AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) + fi +], [ + AC_MSG_RESULT(no) + AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) +] +) + +AC_SUBST(ecore_config_cflags) +AC_SUBST(ecore_config_libs) + AC_OUTPUT([ Makefile ecore-config @@ -352,6 +377,7 @@ src/lib/ecore_con/Makefile src/lib/ecore_ipc/Makefile src/lib/ecore_txt/Makefile +src/lib/ecore_config/Makefile debian/Makefile ], [ chmod +x ecore-config |
From: <enl...@li...> - 2003-12-05 16:57:34
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config/ipc Added Files: ipc_ecore.c Log Message: This should give a working ecore with ecore_config. No test apps yet, that is another story. Also need a tidyup... |
From: <enl...@li...> - 2003-12-05 16:58:04
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib Modified Files: Makefile.am Log Message: This should give a working ecore with ecore_config. No test apps yet, that is another story. Also need a tidyup... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 3 Dec 2003 07:23:08 -0000 1.5 +++ Makefile.am 5 Dec 2003 16:57:32 -0000 1.6 @@ -7,4 +7,5 @@ ecore_con \ ecore_x \ ecore_ipc \ -ecore_evas +ecore_evas \ +ecore_config |
From: <enl...@li...> - 2003-12-05 16:58:04
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: acconfig.h configure.in ecore-config.in Log Message: This should give a working ecore with ecore_config. No test apps yet, that is another story. Also need a tidyup... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/acconfig.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- acconfig.h 5 Dec 2003 15:02:17 -0000 1.6 +++ acconfig.h 5 Dec 2003 16:57:32 -0000 1.7 @@ -1,5 +1,6 @@ #undef PACKAGE_LOCALE_DIR #undef PACKAGE_DATA_DIR +#undef PACKAGE_LIB_DIR #undef PACKAGE_SOURCE_DIR #undef PACKAGE_BIN_DIR #undef BUILD_ECORE_EVAS =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- configure.in 5 Dec 2003 15:02:17 -0000 1.15 +++ configure.in 5 Dec 2003 16:57:32 -0000 1.16 @@ -75,6 +75,17 @@ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}") fi +dnl Set PACKAGE_LIB_DIR in config.h. +if test "x${libdir}" = 'xNONE'; then + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib") + else + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib") + fi +else + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}") +fi + dnl Set PACKAGE_SOURCE_DIR in config.h. packagesrcdir=`cd $srcdir && pwd` AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}") @@ -378,6 +389,7 @@ src/lib/ecore_ipc/Makefile src/lib/ecore_txt/Makefile src/lib/ecore_config/Makefile +src/lib/ecore_config/ipc/Makefile debian/Makefile ], [ chmod +x ecore-config =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/ecore-config.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ecore-config.in 9 Oct 2003 07:49:59 -0000 1.4 +++ ecore-config.in 5 Dec 2003 16:57:32 -0000 1.5 @@ -46,7 +46,7 @@ ;; --libs) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ -lm + echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ @ecore_config_libs@ -lm ;; *) echo "${usage}" 1>&2 |
From: <enl...@li...> - 2003-12-05 16:58:05
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: Makefile.am Added Files: Ecore_Config.h debug.h ecore_config.c edb.c errors.h ipc.h ipc_main.c util.c util.h Log Message: This should give a working ecore with ecore_config. No test apps yet, that is another story. Also need a tidyup... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 5 Dec 2003 15:02:17 -0000 1.1 +++ Makefile.am 5 Dec 2003 16:57:32 -0000 1.2 @@ -16,8 +16,8 @@ libecore_config_la_SOURCES = \ ecore_config.c \ -util.c \ ipc_main.c \ +util.c \ edb.c libecore_config_la_LIBADD = \ @@ -31,10 +31,10 @@ EXTRA_DIST = \ Ecore_Config.h \ ecore_config.c \ -util.c \ -util.h \ ipc_main.c \ ipc.h \ +util.c \ +util.h \ edb.c \ debug.h \ errors.h \ |
From: <enl...@li...> - 2003-12-05 18:13:47
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config/ipc Added Files: Makefile.am Log Message: Oops, missed this file |
From: <enl...@li...> - 2003-12-06 13:16:47
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Added exsh the text mode ecore_config client, we should now have a usable ecore_config =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- configure.in 5 Dec 2003 16:57:32 -0000 1.16 +++ configure.in 6 Dec 2003 13:16:16 -0000 1.17 @@ -374,6 +374,11 @@ AC_SUBST(ecore_config_cflags) AC_SUBST(ecore_config_libs) +edb_libs=`edb-config --libs` +edb_cflags=`edb-config --cflags` +AC_SUBST(edb_libs) +AC_SUBST(edb_cflags) + AC_OUTPUT([ Makefile ecore-config |
From: <enl...@li...> - 2003-12-06 13:16:47
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Modified Files: Makefile.am Log Message: Added exsh the text mode ecore_config client, we should now have a usable ecore_config =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 3 Dec 2003 07:23:08 -0000 1.3 +++ Makefile.am 6 Dec 2003 13:16:17 -0000 1.4 @@ -42,6 +42,12 @@ ECORE_TXT_LIB = endif +if BUILD_ECORE_CONFIG +ECORE_CONFIG_LIB = $(top_builddir)/src/lib/ecore_config/libecore_config.la -ldl +else +ECORE_CONFIG_LIB = +endif + INCLUDES = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_evas \ @@ -51,12 +57,20 @@ -I$(top_srcdir)/src/lib/ecore_con \ -I$(top_srcdir)/src/lib/ecore_ipc \ -I$(top_srcdir)/src/lib/ecore_txt \ +-I$(top_srcdir)/src/lib/ecore_config \ @evas_cflags@ \ @x_cflags@ +if BUILD_ECORE_CONFIG +bin_PROGRAMS = \ +ecore_test \ +exsh \ +ecore_evas_test +else bin_PROGRAMS = \ ecore_test \ ecore_evas_test +endif ecore_test_SOURCES = \ ecore_test.c @@ -121,3 +135,27 @@ $(ECORE_CON_LIB) \ $(ECORE_IPC_LIB) \ $(ECORE_TXT_LIB) + +exsh_SOURCES = \ +exsh.c \ +ecore_config_client.c \ +ecore_config_client.h + +exsh_LDADD = \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(ECORE_IPC_LIB) \ +$(ECORE_CONFIG_LIB) \ +@edb_libs@ + +exsh_LDFLAGS = + +exsh_CFLAGS = \ +$(CFLAGS) \ +$(INCLUDES) \ +$(top_builddir)/src/lib/ecore_config/ \ +@edb_cflags@ + +exsh_DEPENDENCIES = \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(ECORE_CONFIG_LIB) + |
From: <enl...@li...> - 2003-12-06 13:17:35
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Added Files: ecore_config_client.c ecore_config_client.h exsh.c Log Message: Added exsh the text mode ecore_config client, we should now have a usable ecore_config |
From: <enl...@li...> - 2003-12-06 17:24:50
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config/ipc Modified Files: ipc_ecore.c Log Message: Fixups, cleanups etc. ecore_config now working with an equate client :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ipc/ipc_ecore.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ipc_ecore.c 5 Dec 2003 16:57:32 -0000 1.1 +++ ipc_ecore.c 6 Dec 2003 17:24:19 -0000 1.2 @@ -1,8 +1,5 @@ /* by Azundris, with thanks to Corey Donohoe <at...@at...> */ -//#include "config.h" -#include "errors.h" -#include "debug.h" #include "ipc.h" #include <stdio.h> |
From: <enl...@li...> - 2003-12-06 17:24:50
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: Ecore_Config.h Makefile.am ecore_config.c edb.c ipc_main.c util.c util.h Removed Files: debug.h errors.h Log Message: Fixups, cleanups etc. ecore_config now working with an equate client :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Ecore_Config.h 5 Dec 2003 16:57:32 -0000 1.1 +++ Ecore_Config.h 6 Dec 2003 17:24:19 -0000 1.2 @@ -31,11 +31,18 @@ # define TRUE (!FALSE) #endif -#include "debug.h" -#include "errors.h" - #include <Ecore_Ipc.h> +/* debug */ +#define DEBUG 999 + +#ifdef ECORE_CONFIG_DEBUG +# define D(fmt,args...) do { if(DEBUG>=0) fprintf(stderr,fmt,## args); } while(0); +#else +# define D(msg,args...) +#endif +#define E(lvl,fmt,args...) do { if(DEBUG>=(lvl)) fprintf(stderr,fmt,## args); } while(0) + /* structures */ @@ -44,8 +51,7 @@ PT_INT=1, PT_FLT=2, PT_STR=3, - PT_PTR=4, - PT_RGB=5 + PT_RGB=4 } Ecore_Config_Type; @@ -74,8 +80,8 @@ typedef struct Ecore_Config_Prop { char *key; char *description; + void *ptr; Ecore_Config_Type type; - char *ptr; long val,lo,hi,step; Ecore_Config_Flag flags; Ecore_Config_Listener_List *listeners; @@ -116,6 +122,7 @@ int ecore_config_set_string(Ecore_Config_Bundle *t,const char *key,char *val); int ecore_config_set_int(Ecore_Config_Bundle *t,const char *key,int val); int ecore_config_set_rgb(Ecore_Config_Bundle *t,const char *key,char *val); +char *ecore_config_get_rgbstr(const Ecore_Config_Bundle *t,const char *key); int ecore_config_set_float(Ecore_Config_Bundle *t,const char *key,float val); int ecore_config_set_as_string(Ecore_Config_Bundle *t,const char *key,char *val); @@ -123,8 +130,9 @@ int ecore_config_listen(Ecore_Config_Bundle *t,const char *name,const char *key,Ecore_Config_Listener listener,int tag,void *data); int ecore_config_deaf(Ecore_Config_Bundle *t,const char *name,const char *key,Ecore_Config_Listener listener); Ecore_Config_Prop *ecore_config_dst(Ecore_Config_Bundle *t,Ecore_Config_Prop *e); +int ecore_config_guess_type(char *val); -Ecore_Config_Bundle *ecore_config_new_bundle(Ecore_Config_Server *srv, const char *id); +Ecore_Config_Bundle *ecore_config_bundle_new(Ecore_Config_Server *srv, const char *id); Ecore_Config_Bundle *ecore_config_bundle_get_1st(Ecore_Config_Server *srv); Ecore_Config_Bundle *ecore_config_bundle_get_next(Ecore_Config_Bundle *ns); Ecore_Config_Bundle *ecore_config_bundle_get_by_serial(Ecore_Config_Server *srv, long serial); @@ -141,5 +149,24 @@ int ecore_config_load_file(Ecore_Config_Bundle *b, char *file); int ecore_config_save(Ecore_Config_Bundle *b); int ecore_config_save_file(Ecore_Config_Bundle *b, char *file); + +/* error codes */ +# define ECORE_CONFIG_ERR_NOTSUPP (-16) +# define ECORE_CONFIG_ERR_NOFILE (-15) +# define ECORE_CONFIG_ERR_META_DLFAIL (-14) +# define ECORE_CONFIG_ERR_META_FILE (-13) +# define ECORE_CONFIG_ERR_META_FORMAT (-12) +# define ECORE_CONFIG_ERR_MONMIS (-11) +# define ECORE_CONFIG_ERR_NOEXEC (-10) +# define ECORE_CONFIG_ERR_PARTIAL (-9) +# define ECORE_CONFIG_ERR_PATHEX (-8) +# define ECORE_CONFIG_ERR_TYPEMISMATCH (-7) +# define ECORE_CONFIG_ERR_MUTEX (-6) +# define ECORE_CONFIG_ERR_NOTFOUND (-5) +# define ECORE_CONFIG_ERR_OOM (-4) +# define ECORE_CONFIG_ERR_IGNORED (-3) +# define ECORE_CONFIG_ERR_NODATA (-2) +# define ECORE_CONFIG_ERR_FAIL (-1) +# define ECORE_CONFIG_ERR_SUCC (0) #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 5 Dec 2003 16:57:32 -0000 1.2 +++ Makefile.am 6 Dec 2003 17:24:19 -0000 1.3 @@ -35,7 +35,4 @@ ipc.h \ util.c \ util.h \ -edb.c \ -debug.h \ -errors.h \ -structs.h +edb.c =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ecore_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_config.c 5 Dec 2003 16:57:32 -0000 1.1 +++ ecore_config.c 6 Dec 2003 17:24:19 -0000 1.2 @@ -91,8 +91,7 @@ void *ecore_config_get_data(const Ecore_Config_Bundle *t,const char *key) { Ecore_Config_Prop *e=ecore_config_get(t,key); - return (e?(((e->type==PT_STR)||(e->type==PT_PTR))?((void *)&e->ptr) - :((void *)&e->val)) + return (e?((e->type==PT_STR)?((void *)&e->ptr):((void *)&e->val)) :NULL); } @@ -125,7 +124,6 @@ return ECORE_CONFIG_ERR_FAIL; } char *ecore_config_get_rgbstr(const Ecore_Config_Bundle *t,const char *key) { - Ecore_Config_Prop *e=ecore_config_get(t,key); char *r=NULL; esprintf(&r,"#%06x",ecore_config_get_int(t,key)); return r; } @@ -146,8 +144,6 @@ esprintf(&r,"%s:%s=%lf",key,type,ecore_config_get_float(t,key)); break; case PT_STR: esprintf(&r,"%s:%s=\"%s\"",key,type,ecore_config_get_string(t,key)); break; - case PT_PTR: - esprintf(&r,"%s:%s=%p",key,type,e->ptr); break; case PT_RGB: esprintf(&r,"%s:%s=#%06x",key,type,ecore_config_get_int(t,key)); break; default: @@ -190,7 +186,6 @@ int ecore_config_guess_type(char *val) { char *l=NULL; long v; - float f; if(!val) return PT_NIL; @@ -226,15 +221,15 @@ if (((char *)val)[0]=='#') { if((v=strtol(&((char *)val)[1],&l,16))<0) { v=0; - E(0,"ecore_config_val: key \"%s\" -- hexadecimal value less than zero, bound to zero...\n",val); + E(0,"ecore_config_val: key \"%s\" -- hexadecimal value less than zero, bound to zero...\n", (char *)val); l=(char *)val; } } else { - E(0,"ecore_config_val: key \"%s\" -- value \"%s\" not a valid hexadecimal RGB value?\n",e->key,val); + E(0,"ecore_config_val: key \"%s\" -- value \"%s\" not a valid hexadecimal RGB value?\n",e->key,(char *)val); return ECORE_CONFIG_ERR_FAIL; } if(*l) - E(0,"ecore_config_val: key \"%s\" -- value \"%s\" not a valid hexadecimal RGB value?\n",e->key,val); + E(0,"ecore_config_val: key \"%s\" -- value \"%s\" not a valid hexadecimal RGB value?\n",e->key,(char *)val); else { e->val=v; e->type=PT_RGB; @@ -257,6 +252,7 @@ e->flags|=PF_MODIFIED; return ECORE_CONFIG_ERR_SUCC; } + return ECORE_CONFIG_ERR_IGNORED; } @@ -477,7 +473,7 @@ return ns?ns->identifier:NULL; } -Ecore_Config_Bundle *ecore_config_new_bundle(Ecore_Config_Server *srv,const char *identifier) { +Ecore_Config_Bundle *ecore_config_bundle_new(Ecore_Config_Server *srv,const char *identifier) { Ecore_Config_Bundle *t; static long ss=0; /* bundle unique serial */ @@ -486,6 +482,7 @@ t->identifier=identifier; t->serial=++ss; + t->owner=srv->name; t->next=srv->bundles; srv->bundles=t; } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/edb.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- edb.c 5 Dec 2003 16:57:32 -0000 1.1 +++ edb.c 6 Dec 2003 17:24:19 -0000 1.2 @@ -6,14 +6,14 @@ int ecore_config_load(Ecore_Config_Bundle *b) { char* file = malloc(1024); /* ### fixme */ - sprintf(file,"%s/.e/%s/config.db",getenv("HOME"),b->owner); + sprintf(file,"%s/.e/apps/%s/config.db",getenv("HOME"),b->owner); return ecore_config_load_file(b,file); free(file); } int ecore_config_save(Ecore_Config_Bundle *b) { char* file = malloc(1024); /* ### fixme */ - sprintf(file,"%s/.e/%s/config.db",getenv("HOME"),b->owner); + sprintf(file,"%s/.e/apps/%s/config.db",getenv("HOME"),b->owner); return ecore_config_save_file(b,file); free(file); } @@ -76,10 +76,8 @@ int ecore_config_save_file(Ecore_Config_Bundle *b, char *file) { Ecore_Config_Prop *next=b->data; E_DB_File *db = NULL; - int x; /* ### we may need to create a directory or two here! */ - db = e_db_open(file); if (!db) { E(0, "Cannot open database from file %s!\n", file); @@ -100,6 +98,8 @@ case PT_STR: e_db_str_set(db, next->key, ecore_config_get_string(b, next->key)); break; + case PT_NIL: + /* currently we do nothing for undefined ojects */ } next=next->next; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ipc_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ipc_main.c 5 Dec 2003 16:57:32 -0000 1.1 +++ ipc_main.c 6 Dec 2003 17:24:19 -0000 1.2 @@ -5,7 +5,6 @@ #include "Ecore_Config.h" #include "util.h" #include "ipc.h" -#include "errors.h" #include "config.h" @@ -141,7 +140,7 @@ int ipc_bundle_new(Ecore_Config_Server *srv, const char *label) { //Ecore_Config_Bundle *ns=ecore_config_bundle_get_by_serial(srv, 0); - if (ecore_config_new_bundle(srv, label)) + if (ecore_config_bundle_new(srv, label)) return ECORE_CONFIG_ERR_SUCC; return ECORE_CONFIG_ERR_FAIL; } @@ -212,7 +211,7 @@ unsigned int c; ipc *nm=NULL; Ecore_Config_Server *list=NULL; - Ecore_Config_Server *ret_srv; + Ecore_Config_Server *ret_srv=NULL; if (nm) { list=(Ecore_Config_Server *)nm->data; @@ -286,7 +285,7 @@ list->name=strdup(pipe_name); list->next=nm->data; nm->data=list; - if (ret_srv) ret_srv=list; + if (!ret_srv) ret_srv=list; nm->next=ipc_modules; ipc_modules=nm; }} =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/util.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- util.c 5 Dec 2003 16:57:32 -0000 1.1 +++ util.c 6 Dec 2003 17:24:19 -0000 1.2 @@ -1,7 +1,5 @@ /* azundris */ -//#include "config.h" - //#include <glib.h> #include <sys/types.h> @@ -19,8 +17,7 @@ /* #endif */ #include "util.h" -//#include "evidence.h" -#include "errors.h" +#include "Ecore_Config.h" #define CHUNKLEN 4096 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/util.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- util.h 5 Dec 2003 16:57:32 -0000 1.1 +++ util.h 6 Dec 2003 17:24:19 -0000 1.2 @@ -1,8 +1,6 @@ #define TIMER_STOP 0 #define TIMER_CONT 1 -#include "debug.h" - typedef struct _estring { char *str; int alloc,used; |
From: <enl...@li...> - 2003-12-06 17:37:21
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: Ecore_Config.h Log Message: oopsie - got carried away and altered good code =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Ecore_Config.h 6 Dec 2003 17:24:19 -0000 1.2 +++ Ecore_Config.h 6 Dec 2003 17:37:20 -0000 1.3 @@ -80,7 +80,7 @@ typedef struct Ecore_Config_Prop { char *key; char *description; - void *ptr; + char *ptr; Ecore_Config_Type type; long val,lo,hi,step; Ecore_Config_Flag flags; |
From: <enl...@li...> - 2003-12-07 08:35:15
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Modified Files: exsh.c ecore_config_client.c Log Message: oopsies, hopefully this should be better\! =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/exsh.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- exsh.c 6 Dec 2003 13:17:32 -0000 1.1 +++ exsh.c 7 Dec 2003 08:35:13 -0000 1.2 @@ -37,7 +37,6 @@ -#include "errors.h" #include "ipc.h" #include "ecore_config_client.h" @@ -552,7 +551,7 @@ return ret; } -print_usage(void) { +void print_usage(void) { printf("Examine Shell - ecore_config Configuration Client\n"); printf("Version 1.0.0 (Dec 6 2003)\n"); printf("(c)2002-2003 by Azundris et al.\n"); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/ecore_config_client.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_config_client.c 6 Dec 2003 13:17:32 -0000 1.1 +++ ecore_config_client.c 7 Dec 2003 08:35:13 -0000 1.2 @@ -11,7 +11,6 @@ #include <dirent.h> -#include "errors.h" #include "ipc.h" #include "ecore_config_client.h" |
From: <enl...@li...> - 2003-12-08 23:25:44
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: ecore-config.in Log Message: hmm, ecore-config requires -ledb in ecore-config =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/ecore-config.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ecore-config.in 5 Dec 2003 16:57:32 -0000 1.5 +++ ecore-config.in 8 Dec 2003 23:25:13 -0000 1.6 @@ -46,7 +46,7 @@ ;; --libs) libdirs=-L@libdir@ - echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ @ecore_config_libs@ -lm + echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@ @ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ @ecore_config_libs@ @edb_libs@ -lm ;; *) echo "${usage}" 1>&2 |
From: <enl...@li...> - 2003-12-17 11:05:29
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config/ipc Modified Files: ipc_ecore.c Log Message: Spanking works, I am learning\! =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ipc/ipc_ecore.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ipc_ecore.c 6 Dec 2003 17:24:19 -0000 1.2 +++ ipc_ecore.c 17 Dec 2003 11:05:29 -0000 1.3 @@ -178,8 +178,8 @@ if(!server) return ECORE_CONFIG_ERR_FAIL; -// if(*server) -// return ECORE_CONFIG_ERR_IGNORED; +/* if(*server) + return ECORE_CONFIG_ERR_IGNORED; */ ecore_init(); if(ecore_ipc_init()<1) @@ -188,15 +188,15 @@ if((p=getenv("HOME"))) { /* debug-only ### FIXME */ char buf[PATH_MAX]; str=malloc(1000*sizeof(char)); - int stale=1; + int stale; stale=1; while (stale) { sprintf(str,"%s/.ecore/%s/%d",p,pipe_name,port); snprintf(buf,PATH_MAX,str); if(!stat(buf,&st)) { E(0,"IPC/eCore: pipe \"%s\" already exists!?\n",buf); -// if(unlink(buf)) -// E(0,"IPC/eCore: could not remove pipe \"%s\": %d\n",buf,errno); }} +/* if(unlink(buf)) + E(0,"IPC/eCore: could not remove pipe \"%s\": %d\n",buf,errno); }}*/ port++; } else { stale = 0; |
From: <enl...@li...> - 2003-12-17 11:05:59
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: ipc_main.c util.c util.h Log Message: Spanking works, I am learning\! =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ipc_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ipc_main.c 6 Dec 2003 17:24:19 -0000 1.2 +++ ipc_main.c 17 Dec 2003 11:05:28 -0000 1.3 @@ -139,7 +139,6 @@ int ipc_bundle_new(Ecore_Config_Server *srv, const char *label) { - //Ecore_Config_Bundle *ns=ecore_config_bundle_get_by_serial(srv, 0); if (ecore_config_bundle_new(srv, label)) return ECORE_CONFIG_ERR_SUCC; return ECORE_CONFIG_ERR_FAIL; } @@ -270,7 +269,7 @@ E(0,"ipc_init: could not load \"%s\": %s...\n",globbuf.gl_pathv[c],dlerror()); else if(ret==ECORE_CONFIG_ERR_SUCC) { list=malloc(sizeof(Ecore_Config_Server)); -// memcpy(list, 0, sizeof(Ecore_Config_Server)); +/* memcpy(list, 0, sizeof(Ecore_Config_Server));*/ if((ret=nm->ipc_init(pipe_name,&list->server))!=ECORE_CONFIG_ERR_SUCC) E(0,"ipc_init: could not initialize \"%s\": %d\n",globbuf.gl_pathv[c],ret); else { =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/util.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- util.c 6 Dec 2003 17:24:19 -0000 1.2 +++ util.c 17 Dec 2003 11:05:28 -0000 1.3 @@ -1,9 +1,9 @@ /* azundris */ -//#include <glib.h> +/*#include <glib.h>*/ #include <sys/types.h> -//#include <sys/time.h> /* gimetimeofday() */ +/*#include <sys/time.h>*/ /* gimetimeofday() */ #include <stdio.h> /* NULL */ #include <stdlib.h> /* malloc(), free() */ #include <string.h> /* str...() */ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/util.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- util.h 6 Dec 2003 17:24:19 -0000 1.2 +++ util.h 17 Dec 2003 11:05:28 -0000 1.3 @@ -14,7 +14,7 @@ int parse_line(char *,char **,char **,char **,char **); char *unit_size(char *size); -//ulong now(long delay); +/*ulong now(long delay);*/ void qsrt(void *a[],void *data,int lo,int hi,int (*compare)(const void *,const void *,const void *)); int dlmulti(char *name,char *file,int flag,void **libr,const char *fmt, ...); @@ -53,6 +53,6 @@ -//ulong timeout_add(uint f,int(*fun)(void *),void *data); -//int timeout_remove(ulong handle); +/*ulong timeout_add(uint f,int(*fun)(void *),void *data);*/ +/*int timeout_remove(ulong handle);*/ |
From: <enl...@li...> - 2003-12-19 15:35:46
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config/ipc Modified Files: ipc_ecore.c Log Message: more ansi =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ipc/ipc_ecore.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ipc_ecore.c 17 Dec 2003 11:05:29 -0000 1.3 +++ ipc_ecore.c 19 Dec 2003 15:35:45 -0000 1.4 @@ -187,8 +187,9 @@ if((p=getenv("HOME"))) { /* debug-only ### FIXME */ char buf[PATH_MAX]; + int stale; str=malloc(1000*sizeof(char)); - int stale; stale=1; + stale=1; while (stale) { sprintf(str,"%s/.ecore/%s/%d",p,pipe_name,port); snprintf(buf,PATH_MAX,str); |
From: <enl...@li...> - 2003-12-19 16:31:15
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: edb.c Log Message: ansi fixes =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/edb.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edb.c 6 Dec 2003 17:24:19 -0000 1.2 +++ edb.c 19 Dec 2003 16:31:14 -0000 1.3 @@ -23,7 +23,12 @@ char **keys; int key_count; int x; - char *type = NULL; + int itmp; + float ftmp; + char *type; + char *data; + type = NULL; + data = NULL; db = e_db_open_read(file); if (!db) { @@ -37,19 +42,15 @@ type = e_db_type_get(db, keys[x]); if (!type) type = "?"; - char *data = NULL; - if (!strcmp(type, "int")) { - int tmp; - if (e_db_int_get(db, keys[x], &tmp)) { - ecore_config_set_int(b, keys[x], tmp); + if (e_db_int_get(db, keys[x], &itmp)) { + ecore_config_set_int(b, keys[x], itmp); } else { E(0, "Could not read key %s!\n", keys[x]); } } else if (!strcmp(type, "float")) { - float tmp; - if (e_db_float_get(db, keys[x], &tmp)) { - ecore_config_set_float(b, keys[x], tmp); + if (e_db_float_get(db, keys[x], &ftmp)) { + ecore_config_set_float(b, keys[x], ftmp); } else { E(0, "Could not read key %s!\n", keys[x]); } |
From: <enl...@li...> - 2003-12-20 11:06:44
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Modified Files: exsh.c Log Message: more ansi fixes =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/exsh.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- exsh.c 7 Dec 2003 08:35:13 -0000 1.2 +++ exsh.c 20 Dec 2003 11:06:43 -0000 1.3 @@ -69,7 +69,7 @@ para signature; const char *help; } call; - +void print_usage(void); static call calls[]={ { IPC_NONE, "bundle", P_HELPONLY, "List of propertyset-related commands" }, @@ -471,11 +471,23 @@ int main(int argc,char **argv) { - ex_ipc_server_list *server=NULL; - int ret=ECORE_CONFIG_ERR_SUCC,cc=0; - connstate cs=OFFLINE; - char *p,*f=NULL; - char *pipe_name=NULL; + ex_ipc_server_list *server; + int ret,cc; + connstate cs; + char *p,*f,*q; + char *pipe_name; + #ifndef HAVE_LIBREADLINE + char buf[MI]; + #elif defined(HAVE_READLINE_HISTORY) + char *history; + #endif + + f=NULL; + server=NULL; + pipe_name=NULL; + ret=ECORE_CONFIG_ERR_SUCC; + cc=0; + cs=OFFLINE; if (argc <= 1 || (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0)) { print_usage(); @@ -485,10 +497,8 @@ pipe_name=argv[1]; printf("exsh: connecting to %s.\n", pipe_name); -#ifndef HAVE_LIBREADLINE - char buf[MI]; -#elif defined(HAVE_READLINE_HISTORY) - char *history=NULL; +#if defined(HAVE_READLINE_HISTORY) + *history=NULL; using_history(); stifle_history(96); @@ -521,7 +531,7 @@ printf(IN); if((f=p=fgets(buf,MI,stdin))) { #endif - char *q=strchr(p,'\n'); + *q=strchr(p,'\n'); if(q) *q='\0'; if(!strcasecmp(p,"exit")||!strcasecmp(p,"quit")) { |
From: <enl...@li...> - 2003-12-22 17:16:54
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Modified Files: ecore_config_client.c Log Message: more fixes =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/ecore_config_client.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ecore_config_client.c 7 Dec 2003 08:35:13 -0000 1.2 +++ ecore_config_client.c 22 Dec 2003 17:16:53 -0000 1.3 @@ -75,8 +75,17 @@ int ex_ipc_init(ex_ipc_server_list **srv_list,char *pipe_name,connstate *cs) { - int global=FALSE; + int global, port, connected; struct stat st; + char *p, *str; + char buf[PATH_MAX]; + DIR *dir; + struct dirent *socket; + Ecore_Ipc_Server *tmp_sock; + ex_ipc_server_list *tmp; + + global=FALSE; + port=0; if(ecore_ipc_init()<1) return ECORE_CONFIG_ERR_FAIL; @@ -85,15 +94,7 @@ if(*srv_list) return ECORE_CONFIG_ERR_IGNORED; - int port=0; - char *p, *str; - DIR *dir; - struct dirent *socket; - Ecore_Ipc_Server *tmp_sock; - ex_ipc_server_list *tmp; - if((p=getenv("HOME"))) { /* debug-only ### FIXME */ - char buf[PATH_MAX]; str=malloc(1000*sizeof(char)); sprintf(str,"%s/.ecore/%s/.global",p,pipe_name); if (stat(str, &st)) @@ -105,7 +106,7 @@ snprintf(buf,PATH_MAX,str); if(dir=opendir(buf)) { - int connected=0; + connected=0; while ((socket=readdir(dir))) { if (!strcmp(socket->d_name, ".") || !strcmp(socket->d_name, "..") || !strcmp(socket->d_name, ".global")) @@ -207,6 +208,7 @@ return ECORE_CONFIG_ERR_FAIL; if(!*srv_list) return ECORE_CONFIG_ERR_NODATA; + ret = ECORE_CONFIG_ERR_NODATA; if(size<0) size=data?strlen(data)+1:0; |
From: <enl...@li...> - 2003-12-23 00:32:08
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Modified Files: ecore_config_client.c Log Message: oopsie\! =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/ecore_config_client.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ecore_config_client.c 22 Dec 2003 17:16:53 -0000 1.3 +++ ecore_config_client.c 23 Dec 2003 00:32:05 -0000 1.4 @@ -77,8 +77,8 @@ int ex_ipc_init(ex_ipc_server_list **srv_list,char *pipe_name,connstate *cs) { int global, port, connected; struct stat st; - char *p, *str; - char buf[PATH_MAX]; + char *p; + char str[PATH_MAX], buf[PATH_MAX]; DIR *dir; struct dirent *socket; Ecore_Ipc_Server *tmp_sock; @@ -95,7 +95,6 @@ return ECORE_CONFIG_ERR_IGNORED; if((p=getenv("HOME"))) { /* debug-only ### FIXME */ - str=malloc(1000*sizeof(char)); sprintf(str,"%s/.ecore/%s/.global",p,pipe_name); if (stat(str, &st)) global=FALSE; |
From: <enl...@li...> - 2003-12-29 23:10:00
|
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: Makefile.am Log Message: fixup small errors in ecore_config autofoo =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 23 Dec 2003 11:41:24 -0000 1.5 +++ Makefile.am 29 Dec 2003 23:09:57 -0000 1.6 @@ -6,10 +6,10 @@ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_ipc -if BUILD_ECORE_CONFIG - libecore_config_la_LDFLAGS = -version-info 1:0:0 \ -L$(top_builddir)/src/lib/ecore/.libs + +if BUILD_ECORE_CONFIG lib_LTLIBRARIES = libecore_config.la include_HEADERS = \ |