/* find the section from node - if not found create it unless new_type is -1.
you can also specify in new_type if it's NODE_TYPE_LIST or NODE_TYPE_BLOCK */
CONFIG_NODE *config_node_section(CONFIG_NODE *parent, const char *key, int new_type)
+{
+ return config_node_section_index(parent, key, -1, new_type);
+}
+
+CONFIG_NODE *config_node_section_index(CONFIG_NODE *parent, const char *key,
+ int index, int new_type)
{
CONFIG_NODE *node;
+ int nindex;
g_return_val_if_fail(parent != NULL, NULL);
g_return_val_if_fail(is_node_list(parent), NULL);
node = key == NULL ? NULL : config_node_find(parent, key);
if (node != NULL) {
g_return_val_if_fail(new_type == -1 || new_type == node->type, NULL);
- return node;
+ nindex = g_slist_index(parent->value, node);
+ if (index >= 0 && nindex != index &&
+ nindex <= g_slist_length(parent->value)) {
+ /* move it to wanted position */
+ parent->value = g_slist_remove(parent->value, node);
+ parent->value = g_slist_insert(parent->value, node, index);
+ }
+ return node;
}
if (new_type == -1)
return NULL;
node = g_new0(CONFIG_NODE, 1);
- parent->value = g_slist_append(parent->value, node);
+ parent->value = index < 0 ? g_slist_append(parent->value, node) :
+ g_slist_insert(parent->value, node, index);
node->type = new_type;
node->key = key == NULL ? NULL : g_strdup(key);
str = config_get_str(rec, section, key, NULL);
if (str == NULL) return def;
- return toupper(*str) == 'T' || toupper(*str) == 'Y';
-}
-
-/* Return value of key `value_key' from list item where `key' is `value' */
-const char *config_list_find(CONFIG_REC *rec, const char *section, const char *key, const char *value, const char *value_key)
-{
- CONFIG_NODE *node;
-
- node = config_list_find_node(rec, section, key, value, value_key);
- return node != NULL && node->type == NODE_TYPE_KEY ?
- node->value : NULL;
-}
-
-/* Like config_list_find(), but return node instead of it's value */
-CONFIG_NODE *config_list_find_node(CONFIG_REC *rec, const char *section, const char *key, const char *value, const char *value_key)
-{
- CONFIG_NODE *node, *keynode;
- GSList *tmp;
-
- g_return_val_if_fail(rec != NULL, NULL);
- g_return_val_if_fail(key != NULL, NULL);
- g_return_val_if_fail(value_key != NULL, NULL);
-
- node = config_node_traverse(rec, section, FALSE);
- if (node == NULL || !is_node_list(node)) return NULL;
-
- for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
- node = tmp->data;
-
- if (node->type != NODE_TYPE_BLOCK)
- continue;
-
- /* key matches value? */
- keynode = config_node_find(node, key);
- if (keynode == NULL || keynode->type != NODE_TYPE_KEY ||
- g_strcasecmp(keynode->value, value) != 0) continue;
-
- return config_node_find(node, value_key);
- }
-
- return NULL;
+ return i_toupper(*str) == 'T' || i_toupper(*str) == 'Y';
}
char *config_node_get_str(CONFIG_NODE *parent, const char *key, const char *def)
str = config_node_get_str(parent, key, NULL);
if (str == NULL) return def;
- return toupper(*str) == 'T' || toupper(*str) == 'Y' ||
- (toupper(*str) == 'O' && toupper(str[1]) == 'N');
+ return i_toupper(*str) == 'T' || i_toupper(*str) == 'Y' ||
+ (i_toupper(*str) == 'O' && i_toupper(str[1]) == 'N');
}
/* Get the value of keys `key' and `key_value' and put them to
}
/* Returns n'th node from list. */
-CONFIG_NODE *config_node_index(CONFIG_NODE *node, int index)
+CONFIG_NODE *config_node_nth(CONFIG_NODE *node, int index)
{
GSList *tmp;
g_return_val_if_fail(node != NULL, NULL);
g_return_val_if_fail(is_node_list(node), NULL);
- for (tmp = node->value; tmp != NULL; tmp = tmp->next, index--) {
- if (index == 0)
- return tmp->data;
+ for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
+ CONFIG_NODE *node = tmp->data;
+
+ if (node->type != NODE_TYPE_COMMENT) {
+ if (index == 0)
+ return node;
+ index--;
+ }
}
return NULL;
}
+
+/* Returns index for given key */
+int config_node_index(CONFIG_NODE *parent, const char *key)
+{
+ CONFIG_NODE *node;
+ GSList *tmp;
+ int index;
+
+ g_return_val_if_fail(parent != NULL, -1);
+ g_return_val_if_fail(key != NULL, -1);
+
+ node = config_node_find(parent, key);
+ if (node == NULL)
+ return -1;
+
+ index = 0;
+ for (tmp = parent->value; tmp != NULL; tmp = tmp->next) {
+ CONFIG_NODE *tmpnode = tmp->data;
+
+ if (tmpnode == node)
+ return index;
+
+ if (tmpnode->type != NODE_TYPE_COMMENT)
+ index++;
+ }
+
+ return -1;
+}
+
+/* Returns the first non-comment node in list */
+GSList *config_node_first(GSList *list)
+{
+ while (list != NULL) {
+ CONFIG_NODE *node = list->data;
+
+ if (node->type != NODE_TYPE_COMMENT)
+ break;
+ list = list->next;
+ }
+ return list;
+}
+
+/* Returns the next non-comment node in list */
+GSList *config_node_next(GSList *list)
+{
+ list = list->next;
+ return config_node_first(list);
+}
projects / runtime.git / blobdiff