Enlightenment CVS committal
Author : handyande
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
ecore_config.c
Log Message:
latest patch from Morten Nilsen:
- fix indent in various places
- check flag rather than walking list in util
- eliminate multiple key searches while saving
- optimizations
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/ecore_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_config.c 11 Dec 2005 03:32:18 -0000 1.6
+++ ecore_config.c 18 Dec 2005 19:07:52 -0000 1.7
@@ -16,268 +16,282 @@
int
pathcmp(const char *s1, const char *s2)
{
- char *s1d, *s2d;
+ char *s1d, *s2d;
- // strip common part of paths
- while(*s1 && *s2 && *s1 == *s2) {
- s1++;
- s2++;
- }
-
- // handle /foo/bar/baz <> /foo/bar_baz properly
- if (*s1 == '/' && *s2 != '/') return -1;
- if (*s1 != '/' && *s2 == '/') return 1;
-
- // skip leading /
- if (*s1 == '/') s1++;
- if (*s2 == '/') s2++;
-
- // order folders before files
- s1d = strchr(s1, '/');
- s2d = strchr(s2, '/');
- if (s1d != NULL && s2d == NULL) return -1;
- if (s1d == NULL && s2d != NULL) return 1;
+ // strip common part of paths
+ while(*s1 && *s2 && *s1 == *s2)
+ {
+ s1++;
+ s2++;
+ }
+
+ // handle /foo/bar/baz <> /foo/bar_baz properly
+ if (*s1 == '/' && *s2 != '/') return -1;
+ if (*s1 != '/' && *s2 == '/') return 1;
+
+ // skip leading /
+ if (*s1 == '/') s1++;
+ if (*s2 == '/') s2++;
+
+ // order folders before files
+ s1d = strchr(s1, '/');
+ s2d = strchr(s2, '/');
+ if (s1d != NULL && s2d == NULL) return -1;
+ if (s1d == NULL && s2d != NULL) return 1;
- return strcmp(s1, s2);
+ return strcmp(s1, s2);
}
int
del(const char *key)
{
- Ecore_Config_Prop *e;
- e = ecore_config_get(key);
- if(e == NULL) return -1;
+ Ecore_Config_Prop *e;
+ e = ecore_config_get(key);
+ if(e == NULL) return -1;
- ecore_config_dst(e);
- return 0;
+ ecore_config_dst(e);
+ return 0;
}
int
get(const char *key)
{
- Ecore_Config_Prop *e;
+ Ecore_Config_Prop *e;
- if (!(e = ecore_config_get(key))) {
- fprintf(stderr, "No such property\n");
- return -1;
- }
-
- switch (e->type) {
+ if (!(e = ecore_config_get(key)))
+ {
+ fprintf(stderr, "No such property\n");
+ return -1;
+ }
+
+ switch (e->type)
+ {
case ECORE_CONFIG_NIL:
- printf("\n");
- break;
+ printf("\n");
+ break;
case ECORE_CONFIG_INT:
- printf("integer %ld\n", ecore_config_int_get(key));
- break;
+ printf("integer %ld\n", ecore_config_int_get(key));
+ break;
case ECORE_CONFIG_BLN:
- printf("bool %d\n", ecore_config_boolean_get(key));
- break;
+ printf("bool %d\n", ecore_config_boolean_get(key));
+ break;
case ECORE_CONFIG_FLT:
- printf("float %lf\n", ecore_config_float_get(key));
- break;
+ printf("float %lf\n", ecore_config_float_get(key));
+ break;
case ECORE_CONFIG_STR:
- printf("string \"%s\"\n", ecore_config_string_get(key));
- break;
+ printf("string \"%s\"\n", ecore_config_string_get(key));
+ break;
case ECORE_CONFIG_RGB:
- printf("rgb \"%s\"\n", ecore_config_argbstr_get(key));
- break;
+ printf("rgb \"%s\"\n", ecore_config_argbstr_get(key));
+ break;
case ECORE_CONFIG_THM:
- printf("theme \"%s\"\n", ecore_config_theme_get(key));
- break;
+ printf("theme \"%s\"\n", ecore_config_theme_get(key));
+ break;
default:
- fprintf(stderr, "Property has unrecognised type");
- return -1;
- }
- return 0;
+ fprintf(stderr, "Property has unrecognised type");
+ return -1;
+ }
+ return 0;
}
int
list(const char *file)
{
- char *key;
+ char *key;
+
+ Eet_File *ef;
+ Ecore_Config_Prop *e;
+ Ecore_Sheap *keys;
- Eet_File *ef;
- Ecore_Config_Prop *e;
- Ecore_Sheap *keys;
+ // Get number of keys and create heap for sort
+ ef = eet_open(file, EET_FILE_MODE_READ);
+ if (!ef) return -1;
- ef = eet_open(file, EET_FILE_MODE_READ);
- if (!ef) return -1;
+ keys = ecore_sheap_new(ECORE_COMPARE_CB(pathcmp), eet_num_entries(ef));
- keys = ecore_sheap_new(ECORE_COMPARE_CB(pathcmp), eet_num_entries(ef));
+ eet_close(ef);
- eet_close(ef);
+ e = __ecore_config_bundle_local->data;
- e = __ecore_config_bundle_local->data;
+ do
+ {
+ // don't show system settings
+ if( !(e->flags & ECORE_CONFIG_FLAG_SYSTEM) )
+ ecore_sheap_insert(keys, e->key);
+ }
+ while((e = e->next));
- do {
- ecore_sheap_insert(keys, e->key);
- } while((e = e->next));
+ while((key = ecore_sheap_extract(keys)))
+ {
+ printf("%-28s\t", key);
+ get(key);
+ }
- while((key = ecore_sheap_extract(keys))) {
- printf("%-28s\t", key);
- get(key);
- }
+ ecore_sheap_destroy(keys);
- return 0;
+ return 0;
}
void
usage_and_exit(const char *prog, int ret, const char *msg)
{
- if (msg) fprintf(stderr, msg);
- fprintf(stderr, "Usage: %s <options> <command>\n", prog);
- fprintf(stderr, "Modify ecore_config files\n\n");
- fprintf(stderr, "Options:\n");
- fprintf(stderr, " -c, --file=FILE config file\n");
- fprintf(stderr, " -k, --key=KEY must be given for all commands
except -a\n\n");
- fprintf(stderr, "Commands:\n");
- fprintf(stderr, " -a, --list get all keys\n");
- fprintf(stderr, " -g, --get get key\n");
- fprintf(stderr, " -d, --del delete key\n");
- fprintf(stderr, " -b, --bool=VALUE set boolean\n");
- fprintf(stderr, " -f, --float=VALUE set float\n");
- fprintf(stderr, " -i, --int=VALUE set integer\n");
- fprintf(stderr, " -n, --nil set nil\n");
- fprintf(stderr, " -r, --rgb=VALUE set RGBA\n");
- fprintf(stderr, " -s, --string=VALUE set string\n");
- fprintf(stderr, " -t, --theme=VALUE set theme\n\n");
- exit(ret);
+ if (msg) fprintf(stderr, "%s\n\n", msg);
+ fprintf(stderr, "Usage: %s <options> <command>\n", prog);
+ fprintf(stderr, "Modify ecore_config files\n\n");
+ fprintf(stderr, "Options:\n");
+ fprintf(stderr, " -c, --file=FILE config file\n");
+ fprintf(stderr, " -k, --key=KEY must be given for all commands except
-a\n\n");
+ fprintf(stderr, "Commands:\n");
+ fprintf(stderr, " -a, --list get all keys\n");
+ fprintf(stderr, " -g, --get get key\n");
+ fprintf(stderr, " -d, --del delete key\n");
+ fprintf(stderr, " -b, --bool=VALUE set boolean\n");
+ fprintf(stderr, " -f, --float=VALUE set float\n");
+ fprintf(stderr, " -i, --int=VALUE set integer\n");
+ fprintf(stderr, " -n, --nil set nil\n");
+ fprintf(stderr, " -r, --rgb=VALUE set RGBA\n");
+ fprintf(stderr, " -s, --string=VALUE set string\n");
+ fprintf(stderr, " -t, --theme=VALUE set theme\n\n");
+ exit(ret);
}
int
main(int argc, char * const argv[])
{
- const char *prog, *file, *key;
- void *value = (void *)NULL;
- char cmd = 's';
- int type = -1;
- int ret = 0;
- int i;
- float f;
-
- file = key = prog = NULL;
-
- prog = strdup(argv[0]);
-
- if(argc < 4)
- usage_and_exit(prog, 2, NULL);
-
- while(1) {
- static struct option long_options[] = {
- {"file", 1, 0, 'c'},
- {"list", 0, 0, 'a'},
- {"get", 0, 0, 'g'},
- {"del", 0, 0, 'd'},
- {"bool", 1, 0, 'b'},
- {"float", 1, 0, 'f'},
- {"int", 1, 0, 'i'},
- {"nil", 0, 0, 'n'},
- {"rgb", 1, 0, 'r'},
- {"string", 1, 0, 's'},
- {"theme", 1, 0, 't'},
- {"key", 1, 0, 'k'},
- {0, 0, 0, 0}
- };
-
- ret = getopt_long(argc, argv, "c:agdb:f:i:nr:s:t:k:",
long_options, NULL);
- if(ret == -1)
- break;
-
- switch(ret) {
- case 'k':
- key = strdup(optarg);
- break;
- case 'n':
- type = ECORE_CONFIG_NIL;
- value = NULL;
- break;
- case 'b':
- type = ECORE_CONFIG_BLN;
- i = atoi(optarg);
- value = &i;
- break;
- case 'i':
- type = ECORE_CONFIG_INT;
- i = atoi(optarg);
- value = &i;
- break;
- case 'f':
- type = ECORE_CONFIG_FLT;
- f = atof(optarg);
- value = &f;
- break;
- case 'r':
- type = ECORE_CONFIG_RGB;
- value = strdup(optarg);
- break;
- case 's':
- type = ECORE_CONFIG_STR;
- value = strdup(optarg);
- break;
- case 't':
- type = ECORE_CONFIG_THM;
- value = strdup(optarg);
- break;
- case 'c':
- file = strdup(optarg);
- break;
- case '?':
- case ':':
- usage_and_exit(prog, 2, "Bad argument\n");
- default:
- cmd = ret;
- break;
- }
- }
-
- if(cmd == 's' && type == -1)
- usage_and_exit(prog, 2, "You need to specify a command!\n");
-
- if(cmd != 'a' && key == NULL)
- usage_and_exit(prog, 2, "You need to specify key!\n");
-
- if(ecore_config_init("econfig") != ECORE_CONFIG_ERR_SUCC) {
- fprintf(stderr, "Couldn't init ecore_config!\n");
- return 1;
- }
-
- // Remove non-file data
- while (ecore_config_dst(__ecore_config_bundle_local->data));
-
- // Load configuration from file
- ecore_config_file_load(file);
-
- ret = 0;
-
- // Execute command
- switch (cmd) {
- case 's':
- if (ecore_config_typed_set(key, value, type) !=
ECORE_CONFIG_ERR_SUCC) {
- fprintf(stderr, "Set failed for %s\n", key);
- ret = 1;
- } else {
- ecore_config_file_save(file);
- }
- break;
- case 'd':
- if(del(key)) {
- fprintf(stderr, "Delete failed for %s\n", key);
- ret = 1;
- } else {
- ecore_config_file_save(file);
- }
- break;
- case 'g':
- if (get(key)) ret = 1;
- break;
- case 'a':
- if (list(file)) ret = 1;
- break;
- }
+ const char *prog, *file, *key;
+ void *value = (void *)NULL;
+ char cmd = 's';
+ int type = -1;
+ int ret = 0;
+ int i;
+ float f;
+
+ file = key = prog = NULL;
+
+ prog = strdup(argv[0]);
+
+ if(argc < 4)
+ usage_and_exit(prog, 2, NULL);
+
+ while(1)
+ {
+ static struct option long_options[] = {
+ {"file", 1, 0, 'c'},
+ {"list", 0, 0, 'a'},
+ {"get", 0, 0, 'g'},
+ {"del", 0, 0, 'd'},
+ {"bool", 1, 0, 'b'},
+ {"float", 1, 0, 'f'},
+ {"int", 1, 0, 'i'},
+ {"nil", 0, 0, 'n'},
+ {"rgb", 1, 0, 'r'},
+ {"string", 1, 0, 's'},
+ {"theme", 1, 0, 't'},
+ {"key", 1, 0, 'k'},
+ {0, 0, 0, 0}
+ };
+
+ ret = getopt_long(argc, argv, "c:agdb:f:i:nr:s:t:k:", long_options,
NULL);
+ if(ret == -1)
+ break;
+
+ switch(ret)
+ {
+ case 'k':
+ key = strdup(optarg);
+ break;
+ case 'n':
+ type = ECORE_CONFIG_NIL;
+ value = NULL;
+ break;
+ case 'b':
+ type = ECORE_CONFIG_BLN;
+ i = atoi(optarg);
+ value = &i;
+ break;
+ case 'i':
+ type = ECORE_CONFIG_INT;
+ i = atoi(optarg);
+ value = &i;
+ break;
+ case 'f':
+ type = ECORE_CONFIG_FLT;
+ f = atof(optarg);
+ value = &f;
+ break;
+ case 'r':
+ type = ECORE_CONFIG_RGB;
+ value = strdup(optarg);
+ break;
+ case 's':
+ type = ECORE_CONFIG_STR;
+ value = strdup(optarg);
+ break;
+ case 't':
+ type = ECORE_CONFIG_THM;
+ value = strdup(optarg);
+ break;
+ case 'c':
+ file = strdup(optarg);
+ break;
+ case '?':
+ case ':':
+ usage_and_exit(prog, 2, "Bad argument");
+ default:
+ cmd = ret;
+ break;
+ }
+ }
+
+ if(cmd == 's' && type == -1)
+ usage_and_exit(prog, 2, "You need to specify a command!");
+
+ if(cmd != 'a' && key == NULL)
+ usage_and_exit(prog, 2, "You need to specify key!");
+
+ if(ecore_config_init("econfig") != ECORE_CONFIG_ERR_SUCC)
+ {
+ fprintf(stderr, "Couldn't init ecore_config!");
+ return 1;
+ }
+
+ // Load configuration from file
+ ecore_config_file_load(file);
+
+ ret = 0;
+
+ // Execute command
+ switch (cmd)
+ {
+ case 's':
+ if (ecore_config_typed_set(key, value, type) !=
ECORE_CONFIG_ERR_SUCC)
+ {
+ fprintf(stderr, "Set failed for %s", key);
+ ret = 1;
+ } else {
+ ecore_config_file_save(file);
+ }
+ break;
+ case 'd':
+ if(del(key))
+ {
+ fprintf(stderr, "Delete failed for %s", key);
+ ret = 1;
+ } else {
+ ecore_config_file_save(file);
+ }
+ break;
+ case 'g':
+ if (get(key)) ret = 1;
+ break;
+ case 'a':
+ if (list(file)) ret = 1;
+ break;
+ }
- ecore_config_shutdown();
+ ecore_config_shutdown();
- return ret;
+ return ret;
}
#else
int
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
