X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=parser%2Fparse.c;h=f7ca9d708856922e7da0d894ead41a106574c03f;hb=174de91c343dfbdfe866e566393bf4790ae22596;hp=08d86ed0cb604318b0add1b9f126555c12b78440;hpb=cd4377366c863e9d14717d80f8f60ef42a2f2db6;p=chaz%2Fopenbox diff --git a/parser/parse.c b/parser/parse.c index 08d86ed0..f7ca9d70 100644 --- a/parser/parse.c +++ b/parser/parse.c @@ -19,6 +19,7 @@ #include "parse.h" #include #include +#include #include #include @@ -29,7 +30,7 @@ static GSList *xdg_config_dir_paths; static GSList *xdg_data_dir_paths; struct Callback { - char *tag; + gchar *tag; ParseCallback func; void *data; }; @@ -60,7 +61,7 @@ void parse_shutdown(ObParseInst *i) } } -void parse_register(ObParseInst *i, const char *tag, +void parse_register(ObParseInst *i, const gchar *tag, ParseCallback func, void *data) { struct Callback *c; @@ -113,7 +114,7 @@ gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root) return r; } -gboolean parse_load(const char *path, const char *rootname, +gboolean parse_load(const gchar *path, const gchar *rootname, xmlDocPtr *doc, xmlNodePtr *root) { if ((*doc = xmlParseFile(path))) { @@ -136,7 +137,7 @@ gboolean parse_load(const char *path, const char *rootname, return TRUE; } -gboolean parse_load_mem(gpointer data, guint len, const char *rootname, +gboolean parse_load_mem(gpointer data, guint len, const gchar *rootname, xmlDocPtr *doc, xmlNodePtr *root) { if ((*doc = xmlParseMemory(data, len))) { @@ -176,18 +177,18 @@ void parse_tree(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) } } -char *parse_string(xmlDocPtr doc, xmlNodePtr node) +gchar *parse_string(xmlDocPtr doc, xmlNodePtr node) { xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE); - char *s = g_strdup(c ? (char*)c : ""); + gchar *s = g_strdup(c ? (gchar*)c : ""); xmlFree(c); return s; } -int parse_int(xmlDocPtr doc, xmlNodePtr node) +gint parse_int(xmlDocPtr doc, xmlNodePtr node) { xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE); - int i = atoi((char*)c); + gint i = atoi((gchar*)c); xmlFree(c); return i; } @@ -206,7 +207,7 @@ gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node) return b; } -gboolean parse_contains(const char *val, xmlDocPtr doc, xmlNodePtr node) +gboolean parse_contains(const gchar *val, xmlDocPtr doc, xmlNodePtr node) { xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE); gboolean r; @@ -215,7 +216,7 @@ gboolean parse_contains(const char *val, xmlDocPtr doc, xmlNodePtr node) return r; } -xmlNodePtr parse_find_node(const char *tag, xmlNodePtr node) +xmlNodePtr parse_find_node(const gchar *tag, xmlNodePtr node) { while (node) { if (!xmlStrcasecmp(node->name, (const xmlChar*) tag)) @@ -225,32 +226,32 @@ xmlNodePtr parse_find_node(const char *tag, xmlNodePtr node) return NULL; } -gboolean parse_attr_int(const char *name, xmlNodePtr node, int *value) +gboolean parse_attr_int(const gchar *name, xmlNodePtr node, gint *value) { xmlChar *c = xmlGetProp(node, (const xmlChar*) name); gboolean r = FALSE; if (c) { - *value = atoi((char*)c); + *value = atoi((gchar*)c); r = TRUE; } xmlFree(c); return r; } -gboolean parse_attr_string(const char *name, xmlNodePtr node, char **value) +gboolean parse_attr_string(const gchar *name, xmlNodePtr node, gchar **value) { xmlChar *c = xmlGetProp(node, (const xmlChar*) name); gboolean r = FALSE; if (c) { - *value = g_strdup((char*)c); + *value = g_strdup((gchar*)c); r = TRUE; } xmlFree(c); return r; } -gboolean parse_attr_contains(const char *val, xmlNodePtr node, - const char *name) +gboolean parse_attr_contains(const gchar *val, xmlNodePtr node, + const gchar *name) { xmlChar *c = xmlGetProp(node, (const xmlChar*) name); gboolean r; @@ -259,25 +260,37 @@ gboolean parse_attr_contains(const char *val, xmlNodePtr node, return r; } +static gint slist_path_cmp(const gchar *a, const gchar *b) +{ + return strcmp(a, b); +} + +typedef GSList* (*GSListFunc) (gpointer list, gconstpointer data); + +static GSList* slist_path_add(GSList *list, gpointer data, GSListFunc func) +{ + g_assert(func); + + if (!data) + return list; + + if (!g_slist_find_custom(list, data, (GCompareFunc) slist_path_cmp)) + list = func(list, data); + + return list; +} + static GSList* split_paths(const gchar *paths) { GSList *list = NULL; - gchar *c, *e, *s; - - c = g_strdup(paths); - s = c; - e = c - 1; - g_message("paths %s", paths); - while ((e = strchr(e + 1, ':'))) { - *e = '\0'; - g_message("s %s", s); - if (s[0] != '\0') - list = g_slist_append(list, g_strdup(s)); - s = e + 1; - } - if (s[0] != '\0') - list = g_slist_append(list, g_strdup(s)); - g_free(c); + gchar **spl, **it; + + if (!paths) + return NULL; + spl = g_strsplit(paths, ":", -1); + for (it = spl; *it; ++it) + list = slist_path_add(list, *it, (GSListFunc) g_slist_append); + g_free(spl); return list; } @@ -307,33 +320,40 @@ void parse_paths_startup() if (path && path[0] != '\0') /* not unset or empty */ xdg_config_dir_paths = split_paths(path); else { - xdg_config_dir_paths = g_slist_append(xdg_config_dir_paths, + xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths, g_build_filename (G_DIR_SEPARATOR_S, - "etc", "xdg", NULL)); - xdg_config_dir_paths = g_slist_append(xdg_config_dir_paths, - g_strdup(CONFIGDIR)); + "etc", "xdg", NULL), + (GSListFunc) g_slist_append); + xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths, + g_strdup(CONFIGDIR), + (GSListFunc) g_slist_append); } - xdg_config_dir_paths = g_slist_prepend(xdg_config_dir_paths, - xdg_config_home_path); + xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths, + xdg_config_home_path, + (GSListFunc) g_slist_prepend); path = getenv("XDG_DATA_DIRS"); if (path && path[0] != '\0') /* not unset or empty */ xdg_data_dir_paths = split_paths(path); else { - xdg_data_dir_paths = g_slist_append(xdg_data_dir_paths, + xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths, g_build_filename (G_DIR_SEPARATOR_S, - "usr", "local", "share", NULL)); - xdg_data_dir_paths = g_slist_append(xdg_data_dir_paths, + "usr", "local", "share", NULL), + (GSListFunc) g_slist_append); + xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths, g_build_filename (G_DIR_SEPARATOR_S, - "usr", "share", NULL)); - xdg_data_dir_paths = g_slist_append(xdg_data_dir_paths, - g_strdup(DATADIR)); + "usr", "share", NULL), + (GSListFunc) g_slist_append); + xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths, + g_strdup(DATADIR), + (GSListFunc) g_slist_append); } - xdg_data_dir_paths = g_slist_prepend(xdg_data_dir_paths, - xdg_data_home_path); + xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths, + xdg_data_home_path, + (GSListFunc) g_slist_prepend); } void parse_paths_shutdown() @@ -348,6 +368,10 @@ void parse_paths_shutdown() g_free(it->data); g_slist_free(xdg_config_dir_paths); xdg_config_dir_paths = NULL; + for (it = xdg_data_dir_paths; it; it = g_slist_next(it)) + g_free(it->data); + g_slist_free(xdg_data_dir_paths); + xdg_data_dir_paths = NULL; } gchar *parse_expand_tilde(const gchar *f) @@ -363,21 +387,45 @@ gchar *parse_expand_tilde(const gchar *f) return ret; } -void parse_mkdir_path(const gchar *path, gint mode) +gboolean parse_mkdir(const gchar *path, gint mode) +{ + gboolean ret = TRUE; + + g_return_val_if_fail(path != NULL, FALSE); + g_return_val_if_fail(path[0] != '\0', FALSE); + + if (!g_file_test(path, G_FILE_TEST_IS_DIR)) + if (mkdir(path, mode) == -1) + ret = FALSE; + + return ret; +} + +gboolean parse_mkdir_path(const gchar *path, gint mode) { - gchar *c, *e; + gboolean ret = TRUE; + + g_return_val_if_fail(path != NULL, FALSE); + g_return_val_if_fail(path[0] == '/', FALSE); - g_assert(path[0] == '/'); + if (!g_file_test(path, G_FILE_TEST_IS_DIR)) { + gchar *c, *e; + + c = g_strdup(path); + e = c; + while ((e = strchr(e + 1, '/'))) { + *e = '\0'; + if (!(ret = parse_mkdir(c, mode))) + goto parse_mkdir_path_end; + *e = '/'; + } + ret = parse_mkdir(c, mode); - c = g_strdup(path); - e = c; - while ((e = strchr(e + 1, '/'))) { - *e = '\0'; - mkdir(c, mode); - *e = '/'; + parse_mkdir_path_end: + g_free(c); } - mkdir(c, mode); - g_free(c); + + return ret; } const gchar* parse_xdg_config_home_path()