|
|
|
@ -485,6 +485,10 @@ int iso_node_take(IsoNode *node)
|
|
|
|
|
/* should never occur */
|
|
|
|
|
return ISO_ASSERT_FAILURE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* notify iterators just before remove */
|
|
|
|
|
iso_notify_dir_iters(node, 0);
|
|
|
|
|
|
|
|
|
|
*pos = node->next;
|
|
|
|
|
node->parent = NULL;
|
|
|
|
|
node->next = NULL;
|
|
|
|
@ -531,7 +535,6 @@ static
|
|
|
|
|
int iter_take(IsoDirIter *iter)
|
|
|
|
|
{
|
|
|
|
|
struct dir_iter_data *data;
|
|
|
|
|
IsoNode *pos, *pre;
|
|
|
|
|
if (iter == NULL) {
|
|
|
|
|
return ISO_NULL_POINTER;
|
|
|
|
|
}
|
|
|
|
@ -549,38 +552,7 @@ int iter_take(IsoDirIter *iter)
|
|
|
|
|
/* clear next flag */
|
|
|
|
|
data->flag &= ~0x01;
|
|
|
|
|
|
|
|
|
|
pos = iter->dir->children;
|
|
|
|
|
pre = NULL;
|
|
|
|
|
while (pos != NULL && pos != data->pos) {
|
|
|
|
|
pre = pos;
|
|
|
|
|
pos = pos->next;
|
|
|
|
|
}
|
|
|
|
|
if (pos == NULL) {
|
|
|
|
|
return ISO_ERROR; /* node not in dir */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pos != data->pos) {
|
|
|
|
|
return ISO_ASSERT_FAILURE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* dispose iterator reference */
|
|
|
|
|
iso_node_unref(data->pos);
|
|
|
|
|
|
|
|
|
|
if (pre == NULL) {
|
|
|
|
|
/* node is a first position */
|
|
|
|
|
iter->dir->children = pos->next;
|
|
|
|
|
data->pos = NULL;
|
|
|
|
|
} else {
|
|
|
|
|
pre->next = pos->next;
|
|
|
|
|
data->pos = pre;
|
|
|
|
|
iso_node_ref(pre); /* take iter ref */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* take pos */
|
|
|
|
|
pos->parent = NULL;
|
|
|
|
|
pos->next = NULL;
|
|
|
|
|
iter->dir->nchildren--;
|
|
|
|
|
return ISO_SUCCESS;
|
|
|
|
|
return iso_node_take(data->pos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
@ -601,19 +573,49 @@ int iter_remove(IsoDirIter *iter)
|
|
|
|
|
/* remove node */
|
|
|
|
|
iso_node_unref(pos);
|
|
|
|
|
}
|
|
|
|
|
if (data->pos == pos) {
|
|
|
|
|
return ISO_ERROR;
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void iter_notify_child_taken(IsoDirIter *iter, IsoNode *node)
|
|
|
|
|
{
|
|
|
|
|
IsoNode *pos, *pre;
|
|
|
|
|
struct dir_iter_data *data;
|
|
|
|
|
data = iter->data;
|
|
|
|
|
|
|
|
|
|
if (data->pos == node) {
|
|
|
|
|
pos = iter->dir->children;
|
|
|
|
|
pre = NULL;
|
|
|
|
|
while (pos != NULL && pos != data->pos) {
|
|
|
|
|
pre = pos;
|
|
|
|
|
pos = pos->next;
|
|
|
|
|
}
|
|
|
|
|
if (pos == NULL || pos != data->pos) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* dispose iterator reference */
|
|
|
|
|
iso_node_unref(data->pos);
|
|
|
|
|
|
|
|
|
|
if (pre == NULL) {
|
|
|
|
|
/* node is a first position */
|
|
|
|
|
iter->dir->children = pos->next;
|
|
|
|
|
data->pos = NULL;
|
|
|
|
|
} else {
|
|
|
|
|
pre->next = pos->next;
|
|
|
|
|
data->pos = pre;
|
|
|
|
|
iso_node_ref(pre); /* take iter ref */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
struct iso_dir_iter_iface iter_class = {
|
|
|
|
|
iter_next,
|
|
|
|
|
iter_has_next,
|
|
|
|
|
iter_free,
|
|
|
|
|
iter_take,
|
|
|
|
|
iter_remove
|
|
|
|
|
iter_remove,
|
|
|
|
|
iter_notify_child_taken
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int iso_dir_get_children(const IsoDir *dir, IsoDirIter **iter)
|
|
|
|
@ -639,6 +641,11 @@ int iso_dir_get_children(const IsoDir *dir, IsoDirIter **iter)
|
|
|
|
|
data->pos = NULL;
|
|
|
|
|
data->flag = 0x00;
|
|
|
|
|
it->data = data;
|
|
|
|
|
|
|
|
|
|
if (iso_dir_iter_register(it) < 0) {
|
|
|
|
|
free(it);
|
|
|
|
|
return ISO_OUT_OF_MEM;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*iter = it;
|
|
|
|
|
return ISO_SUCCESS;
|
|
|
|
@ -663,6 +670,7 @@ int iso_dir_iter_has_next(IsoDirIter *iter)
|
|
|
|
|
void iso_dir_iter_free(IsoDirIter *iter)
|
|
|
|
|
{
|
|
|
|
|
if (iter != NULL) {
|
|
|
|
|
iso_dir_iter_unregister(iter);
|
|
|
|
|
iter->class->free(iter);
|
|
|
|
|
free(iter);
|
|
|
|
|
}
|
|
|
|
@ -970,6 +978,63 @@ int iso_dir_insert(IsoDir *dir, IsoNode *node, IsoNode **pos,
|
|
|
|
|
return ++dir->nchildren;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* iterators are stored in a linked list */
|
|
|
|
|
struct iter_reg_node {
|
|
|
|
|
IsoDirIter *iter;
|
|
|
|
|
struct iter_reg_node *next;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* list header */
|
|
|
|
|
static
|
|
|
|
|
struct iter_reg_node *iter_reg = NULL;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Add a new iterator to the registry. The iterator register keeps track of
|
|
|
|
|
* all iterators being used, and are notified when directory structure
|
|
|
|
|
* changes.
|
|
|
|
|
*/
|
|
|
|
|
int iso_dir_iter_register(IsoDirIter *iter)
|
|
|
|
|
{
|
|
|
|
|
struct iter_reg_node *new;
|
|
|
|
|
new = malloc(sizeof(struct iter_reg_node));
|
|
|
|
|
if (new == NULL) {
|
|
|
|
|
return ISO_OUT_OF_MEM;
|
|
|
|
|
}
|
|
|
|
|
new->iter = iter;
|
|
|
|
|
new->next = iter_reg;
|
|
|
|
|
iter_reg = new;
|
|
|
|
|
return ISO_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Unregister a directory iterator.
|
|
|
|
|
*/
|
|
|
|
|
void iso_dir_iter_unregister(IsoDirIter *iter)
|
|
|
|
|
{
|
|
|
|
|
struct iter_reg_node **pos;
|
|
|
|
|
pos = &iter_reg;
|
|
|
|
|
while (*pos != NULL && (*pos)->iter != iter) {
|
|
|
|
|
pos = &(*pos)->next;
|
|
|
|
|
}
|
|
|
|
|
if (*pos) {
|
|
|
|
|
struct iter_reg_node *tmp = (*pos)->next;
|
|
|
|
|
free(*pos);
|
|
|
|
|
*pos = tmp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void iso_notify_dir_iters(IsoNode *node, int flag)
|
|
|
|
|
{
|
|
|
|
|
struct iter_reg_node *pos = iter_reg;
|
|
|
|
|
while (pos != NULL) {
|
|
|
|
|
IsoDirIter *iter = pos->iter;
|
|
|
|
|
if (iter->dir == node->parent) {
|
|
|
|
|
iter->class->notify_child_taken(iter, node);
|
|
|
|
|
}
|
|
|
|
|
pos = pos->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int iso_node_new_root(IsoDir **root)
|
|
|
|
|
{
|
|
|
|
|
IsoDir *dir;
|
|
|
|
|