proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 10:03:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3426 from ethomson/fs_iterator

Browse Source 
iterator: loop fs_iterator advance (don't recurse)
This commit is contained in:
Carlos Martín Nieto 2015-09-13 22:31:08 +02:00
commit ceb01c091b
1 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/iterator.c
View File

@ -1432,19 +1432,14 @@ static int fs_iterator__advance_into(
return error; return error;
} }
static int fs_iterator__advance_over( static void fs_iterator__advance_over_internal(git_iterator *self)
const git_index_entry **entry, git_iterator *self)
{ {
int error = 0;
fs_iterator *fi = (fs_iterator *)self; fs_iterator *fi = (fs_iterator *)self;
fs_iterator_frame *ff; fs_iterator_frame *ff;
fs_iterator_path_with_stat *next; fs_iterator_path_with_stat *next;
if (entry != NULL)
*entry = NULL;
while (fi->entry.path != NULL) { while (fi->entry.path != NULL) {
ff = fi->stack; ff = fi->stack;
next = git_vector_get(&ff->entries, ++ff->index); next = git_vector_get(&ff->entries, ++ff->index);
if (next != NULL) if (next != NULL)
@ -1452,8 +1447,19 @@ static int fs_iterator__advance_over(
fs_iterator__pop_frame(fi, ff, false); fs_iterator__pop_frame(fi, ff, false);
} }
}
error = fs_iterator__update_entry(fi); static int fs_iterator__advance_over(
const git_index_entry **entry, git_iterator *self)
{
int error;
if (entry != NULL)
*entry = NULL;
fs_iterator__advance_over_internal(self);
error = fs_iterator__update_entry((fs_iterator *)self);
if (!error && entry != NULL) if (!error && entry != NULL)
error = fs_iterator__current(entry, self); error = fs_iterator__current(entry, self);
@ -1530,41 +1536,50 @@ static int fs_iterator__update_entry(fs_iterator *fi)
{ {
fs_iterator_path_with_stat *ps; fs_iterator_path_with_stat *ps;
memset(&fi->entry, 0, sizeof(fi->entry)); while (true) {
memset(&fi->entry, 0, sizeof(fi->entry));
if (!fi->stack) if (!fi->stack)
return GIT_ITEROVER; return GIT_ITEROVER;
ps = git_vector_get(&fi->stack->entries, fi->stack->index); ps = git_vector_get(&fi->stack->entries, fi->stack->index);
if (!ps) if (!ps)
return GIT_ITEROVER; return GIT_ITEROVER;
git_buf_truncate(&fi->path, fi->root_len); git_buf_truncate(&fi->path, fi->root_len);
if (git_buf_put(&fi->path, ps->path, ps->path_len) < 0) if (git_buf_put(&fi->path, ps->path, ps->path_len) < 0)
return -1; return -1;
if (iterator__past_end(fi, fi->path.ptr + fi->root_len)) if (iterator__past_end(fi, fi->path.ptr + fi->root_len))
return GIT_ITEROVER; return GIT_ITEROVER;
fi->entry.path = ps->path; fi->entry.path = ps->path;
fi->pathlist_match = ps->pathlist_match; fi->pathlist_match = ps->pathlist_match;
git_index_entry__init_from_stat(&fi->entry, &ps->st, true); git_index_entry__init_from_stat(&fi->entry, &ps->st, true);
/* need different mode here to keep directories during iteration */ /* need different mode here to keep directories during iteration */
fi->entry.mode = git_futils_canonical_mode(ps->st.st_mode); fi->entry.mode = git_futils_canonical_mode(ps->st.st_mode);
/* allow wrapper to check/update the entry (can force skip) */ /* allow wrapper to check/update the entry (can force skip) */
if (fi->update_entry_cb && if (fi->update_entry_cb &&
fi->update_entry_cb(fi) == GIT_ENOTFOUND) fi->update_entry_cb(fi) == GIT_ENOTFOUND) {
return fs_iterator__advance_over(NULL, (git_iterator *)fi); fs_iterator__advance_over_internal(&fi->base);
continue;
}
/* if this is a tree and trees aren't included, then skip */ /* if this is a tree and trees aren't included, then skip */
if (fi->entry.mode == GIT_FILEMODE_TREE && !iterator__include_trees(fi)) { if (fi->entry.mode == GIT_FILEMODE_TREE && !iterator__include_trees(fi)) {
int error = fs_iterator__advance_into(NULL, (git_iterator *)fi); int error = fs_iterator__advance_into(NULL, &fi->base);
if (error != GIT_ENOTFOUND)
return error; if (error != GIT_ENOTFOUND)
giterr_clear(); return error;
return fs_iterator__advance_over(NULL, (git_iterator *)fi);
giterr_clear();
fs_iterator__advance_over_internal(&fi->base);
continue;
}
break;
} }
return 0; return 0;