nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid duplicates in the path lists

Browse source
This commit is contained in:
Dana Jansens 2003-10-25 18:57:34 +00:00
parent de98f8153b
commit 138d98fc3f
1 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
parser/parse.c
View file

@ -259,6 +259,26 @@ gboolean parse_attr_contains(const gchar *val, xmlNodePtr node,
return r; 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) static GSList* split_paths(const gchar *paths)
{ {
GSList *list = NULL; GSList *list = NULL;
@ -268,7 +288,7 @@ static GSList* split_paths(const gchar *paths)
return NULL; return NULL;
spl = g_strsplit(paths, ":", -1); spl = g_strsplit(paths, ":", -1);
for (it = spl; *it; ++it) for (it = spl; *it; ++it)
list = g_slist_append(list, *it); list = slist_path_add(list, *it, (GSListFunc) g_slist_append);
g_free(spl); g_free(spl);
return list; return list;
} }
@ -299,33 +319,40 @@ void parse_paths_startup()
if (path && path[0] != '\0') /* not unset or empty */ if (path && path[0] != '\0') /* not unset or empty */
xdg_config_dir_paths = split_paths(path); xdg_config_dir_paths = split_paths(path);
else { 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_build_filename
(G_DIR_SEPARATOR_S, (G_DIR_SEPARATOR_S,
"etc", "xdg", NULL)); "etc", "xdg", NULL),
xdg_config_dir_paths = g_slist_append(xdg_config_dir_paths, (GSListFunc) g_slist_append);
g_strdup(CONFIGDIR)); 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_dir_paths = slist_path_add(xdg_config_dir_paths,
xdg_config_home_path); xdg_config_home_path,
(GSListFunc) g_slist_prepend);
path = getenv("XDG_DATA_DIRS"); path = getenv("XDG_DATA_DIRS");
if (path && path[0] != '\0') /* not unset or empty */ if (path && path[0] != '\0') /* not unset or empty */
xdg_data_dir_paths = split_paths(path); xdg_data_dir_paths = split_paths(path);
else { 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_build_filename
(G_DIR_SEPARATOR_S, (G_DIR_SEPARATOR_S,
"usr", "local", "share", NULL)); "usr", "local", "share", NULL),
xdg_data_dir_paths = g_slist_append(xdg_data_dir_paths, (GSListFunc) g_slist_append);
xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
g_build_filename g_build_filename
(G_DIR_SEPARATOR_S, (G_DIR_SEPARATOR_S,
"usr", "share", NULL)); "usr", "share", NULL),
xdg_data_dir_paths = g_slist_append(xdg_data_dir_paths, (GSListFunc) g_slist_append);
g_strdup(DATADIR)); 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_dir_paths = slist_path_add(xdg_data_dir_paths,
xdg_data_home_path); xdg_data_home_path,
(GSListFunc) g_slist_prepend);
} }
void parse_paths_shutdown() void parse_paths_shutdown()