iterator.c 35.4 KB
Newer Older
1
/*
Edward Thomson committed
2
 * Copyright (C) the libgit2 contributors. All rights reserved.
3 4 5 6 7 8 9
 *
 * This file is part of libgit2, distributed under the GNU GPL v2 with
 * a Linking Exception. For full terms see the included COPYING file.
 */

#include "iterator.h"
#include "tree.h"
10
#include "index.h"
11 12
#include "ignore.h"
#include "buffer.h"
13
#include "git2/submodule.h"
14
#include <ctype.h>
15

16 17 18
#define ITERATOR_SET_CB(P,NAME_LC) do { \
	(P)->cb.current = NAME_LC ## _iterator__current; \
	(P)->cb.advance = NAME_LC ## _iterator__advance; \
19
	(P)->cb.advance_into = NAME_LC ## _iterator__advance_into; \
20 21
	(P)->cb.seek    = NAME_LC ## _iterator__seek; \
	(P)->cb.reset   = NAME_LC ## _iterator__reset; \
22
	(P)->cb.at_end  = NAME_LC ## _iterator__at_end; \
23 24 25
	(P)->cb.free    = NAME_LC ## _iterator__free; \
	} while (0)

26 27 28
#define ITERATOR_CASE_FLAGS \
	(GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_IGNORE_CASE)

29
#define ITERATOR_BASE_INIT(P,NAME_LC,NAME_UC,REPO) do { \
30
	(P)->base.type    = GIT_ITERATOR_TYPE_ ## NAME_UC; \
31
	(P)->base.cb      = &(P)->cb; \
32
	ITERATOR_SET_CB(P,NAME_LC); \
33
	(P)->base.repo    = (REPO); \
34 35
	(P)->base.start   = start ? git__strdup(start) : NULL; \
	(P)->base.end     = end ? git__strdup(end) : NULL; \
36 37
	if ((start && !(P)->base.start) || (end && !(P)->base.end)) { \
		git__free(P); return -1; } \
38
	(P)->base.prefixcomp = git__prefixcmp; \
39
	(P)->base.flags = flags & ~ITERATOR_CASE_FLAGS; \
40 41
	if ((P)->base.flags & GIT_ITERATOR_DONT_AUTOEXPAND) \
		(P)->base.flags |= GIT_ITERATOR_INCLUDE_TREES; \
42 43
	} while (0)

44 45 46 47 48
#define iterator__flag(I,F) ((((git_iterator *)(I))->flags & GIT_ITERATOR_ ## F) != 0)
#define iterator__ignore_case(I)     iterator__flag(I,IGNORE_CASE)
#define iterator__include_trees(I)   iterator__flag(I,INCLUDE_TREES)
#define iterator__dont_autoexpand(I) iterator__flag(I,DONT_AUTOEXPAND)
#define iterator__do_autoexpand(I)   !iterator__flag(I,DONT_AUTOEXPAND)
49

50 51 52
#define GIT_ITERATOR_FIRST_ACCESS (1 << 15)
#define iterator__has_been_accessed(I) iterator__flag(I,FIRST_ACCESS)

53
#define iterator__end(I) ((git_iterator *)(I))->end
54 55 56 57
#define iterator__past_end(I,PATH) \
	(iterator__end(I) && ((git_iterator *)(I))->prefixcomp((PATH),iterator__end(I)) > 0)


58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
static int iterator__reset_range(
	git_iterator *iter, const char *start, const char *end)
{
	if (start) {
		if (iter->start)
			git__free(iter->start);
		iter->start = git__strdup(start);
		GITERR_CHECK_ALLOC(iter->start);
	}

	if (end) {
		if (iter->end)
			git__free(iter->end);
		iter->end = git__strdup(end);
		GITERR_CHECK_ALLOC(iter->end);
	}

75 76
	iter->flags &= ~GIT_ITERATOR_FIRST_ACCESS;

77 78
	return 0;
}
79

80
static int iterator__update_ignore_case(
81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
	git_iterator *iter,
	git_iterator_flag_t flags)
{
	int error = 0, ignore_case = -1;

	if ((flags & GIT_ITERATOR_IGNORE_CASE) != 0)
		ignore_case = true;
	else if ((flags & GIT_ITERATOR_DONT_IGNORE_CASE) != 0)
		ignore_case = false;
	else {
		git_index *index;

		if (!(error = git_repository_index__weakptr(&index, iter->repo)))
			ignore_case = (index->ignore_case != false);
	}

	if (ignore_case > 0)
		iter->flags = (iter->flags | GIT_ITERATOR_IGNORE_CASE);
	else if (ignore_case == 0)
		iter->flags = (iter->flags & ~GIT_ITERATOR_IGNORE_CASE);

102
	iter->prefixcomp = iterator__ignore_case(iter) ?
103 104
		git__prefixcmp_icase : git__prefixcmp;

105 106 107
	return error;
}

108
GIT_INLINE(void) iterator__clear_entry(const git_index_entry **entry)
109
{
110
	if (entry) *entry = NULL;
111 112 113 114 115 116 117
}


static int empty_iterator__noop(const git_index_entry **e, git_iterator *i)
{
	GIT_UNUSED(i);
	iterator__clear_entry(e);
118
	return GIT_ITEROVER;
119 120
}

121
static int empty_iterator__seek(git_iterator *i, const char *p)
122
{
123
	GIT_UNUSED(i); GIT_UNUSED(p);
124 125 126
	return -1;
}

127
static int empty_iterator__reset(git_iterator *i, const char *s, const char *e)
128
{
129
	GIT_UNUSED(i); GIT_UNUSED(s); GIT_UNUSED(e);
130 131 132
	return 0;
}

133
static int empty_iterator__at_end(git_iterator *i)
134
{
135
	GIT_UNUSED(i);
136 137 138
	return 1;
}

139
static void empty_iterator__free(git_iterator *i)
140
{
141
	GIT_UNUSED(i);
142 143
}

144 145 146 147 148
typedef struct {
	git_iterator base;
	git_iterator_callbacks cb;
} empty_iterator;

149 150 151 152 153
int git_iterator_for_nothing(
	git_iterator **iter,
	git_iterator_flag_t flags,
	const char *start,
	const char *end)
154
{
155 156
	empty_iterator *i = git__calloc(1, sizeof(empty_iterator));
	GITERR_CHECK_ALLOC(i);
157

158 159
#define empty_iterator__current empty_iterator__noop
#define empty_iterator__advance empty_iterator__noop
160
#define empty_iterator__advance_into empty_iterator__noop
161

162
	ITERATOR_BASE_INIT(i, empty, EMPTY, NULL);
163 164 165

	if ((flags & GIT_ITERATOR_IGNORE_CASE) != 0)
		i->base.flags |= GIT_ITERATOR_IGNORE_CASE;
166

167
	*iter = (git_iterator *)i;
168 169 170
	return 0;
}

171

172 173 174 175 176 177
typedef struct tree_iterator_entry tree_iterator_entry;
struct tree_iterator_entry {
	tree_iterator_entry *parent;
	const git_tree_entry *te;
	git_tree *tree;
};
178

179 180
typedef struct tree_iterator_frame tree_iterator_frame;
struct tree_iterator_frame {
181
	tree_iterator_frame *up, *down;
182 183 184 185 186

	size_t n_entries; /* items in this frame */
	size_t current;   /* start of currently active range in frame */
	size_t next;      /* start of next range in frame */

187
	const char *start;
188
	size_t startlen;
189

190
	tree_iterator_entry *entries[GIT_FLEX_ARRAY];
191
};
192 193

typedef struct {
194
	git_iterator base;
195
	git_iterator_callbacks cb;
196 197
	tree_iterator_frame *head, *root;
	git_pool pool;
198 199
	git_index_entry entry;
	git_buf path;
200
	int path_ambiguities;
201
	bool path_has_filename;
202
	bool entry_is_current;
203
	int (*strncomp)(const char *a, const char *b, size_t sz);
204
} tree_iterator;
205

206 207 208 209 210 211
static char *tree_iterator__current_filename(
	tree_iterator *ti, const git_tree_entry *te)
{
	if (!ti->path_has_filename) {
		if (git_buf_joinpath(&ti->path, ti->path.ptr, te->filename) < 0)
			return NULL;
212 213 214 215

		if (git_tree_entry__is_tree(te) && git_buf_putc(&ti->path, '/') < 0)
			return NULL;

216 217 218 219 220 221
		ti->path_has_filename = true;
	}

	return ti->path.ptr;
}

222
static void tree_iterator__rewrite_filename(tree_iterator *ti)
223
{
224
	tree_iterator_entry *scan = ti->head->entries[ti->head->current];
225 226
	ssize_t strpos = ti->path.size;
	const git_tree_entry *te;
227

228 229 230
	if (strpos && ti->path.ptr[strpos - 1] == '/')
		strpos--;

231
	for (; scan && (te = scan->te); scan = scan->parent) {
232 233 234
		strpos -= te->filename_len;
		memcpy(&ti->path.ptr[strpos], te->filename, te->filename_len);
		strpos -= 1; /* separator */
235
	}
236
}
237

238
static int tree_iterator__te_cmp(
239 240
	const git_tree_entry *a,
	const git_tree_entry *b,
241
	int (*compare)(const char *, const char *, size_t))
242
{
243 244 245 246
	return git_path_cmp(
		a->filename, a->filename_len, a->attr == GIT_FILEMODE_TREE,
		b->filename, b->filename_len, b->attr == GIT_FILEMODE_TREE,
		compare);
247 248
}

249
static int tree_iterator__ci_cmp(const void *a, const void *b, void *p)
250
{
251
	const tree_iterator_entry *ae = a, *be = b;
252
	int cmp = tree_iterator__te_cmp(ae->te, be->te, git__strncasecmp);
253 254

	if (!cmp) {
255 256 257 258 259
		/* stabilize sort order among equivalent names */
		if (!ae->parent->te || !be->parent->te)
			cmp = tree_iterator__te_cmp(ae->te, be->te, git__strncmp);
		else
			cmp = tree_iterator__ci_cmp(ae->parent, be->parent, p);
260 261 262
	}

	return cmp;
263 264
}

265 266 267 268 269 270 271 272 273 274 275
static int tree_iterator__search_cmp(const void *key, const void *val, void *p)
{
	const tree_iterator_frame *tf = key;
	const git_tree_entry *te = ((tree_iterator_entry *)val)->te;

	return git_path_cmp(
		tf->start, tf->startlen, false,
		te->filename, te->filename_len, te->attr == GIT_FILEMODE_TREE,
		((tree_iterator *)p)->strncomp);
}

276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
static bool tree_iterator__move_to_next(
	tree_iterator *ti, tree_iterator_frame *tf)
{
	if (tf->next > tf->current + 1)
		ti->path_ambiguities--;

	if (!tf->up) { /* at root */
		tf->current = tf->next;
		return false;
	}

	for (; tf->current < tf->next; tf->current++) {
		git_tree_free(tf->entries[tf->current]->tree);
		tf->entries[tf->current]->tree = NULL;
	}

	return (tf->current < tf->n_entries);
}

295
static int tree_iterator__set_next(tree_iterator *ti, tree_iterator_frame *tf)
296
{
297
	int error = 0;
298
	const git_tree_entry *te, *last = NULL;
299

300
	tf->next = tf->current;
301

302 303 304 305
	for (; tf->next < tf->n_entries; tf->next++, last = te) {
		te = tf->entries[tf->next]->te;

		if (last && tree_iterator__te_cmp(last, te, ti->strncomp))
306
			break;
307

308 309 310 311
		/* try to load trees for items in [current,next) range */
		if (!error && git_tree_entry__is_tree(te))
			error = git_tree_lookup(
				&tf->entries[tf->next]->tree, ti->base.repo, &te->oid);
312
	}
313

314 315 316
	if (tf->next > tf->current + 1)
		ti->path_ambiguities++;

317 318 319 320 321 322
	/* if a tree lookup failed, advance over this span and return failure */
	if (error < 0) {
		tree_iterator__move_to_next(ti, tf);
		return error;
	}

323
	if (last && !tree_iterator__current_filename(ti, last))
324
		return -1; /* must have been allocation failure */
325

326
	return 0;
327 328
}

329
GIT_INLINE(bool) tree_iterator__at_tree(tree_iterator *ti)
330
{
331
	return (ti->head->current < ti->head->n_entries &&
332
			ti->head->entries[ti->head->current]->tree != NULL);
333 334
}

335
static int tree_iterator__push_frame(tree_iterator *ti)
336
{
337
	int error = 0;
338 339
	tree_iterator_frame *head = ti->head, *tf = NULL;
	size_t i, n_entries = 0;
340

341
	if (head->current >= head->n_entries || !head->entries[head->current]->tree)
342
		return GIT_ITEROVER;
343

344 345 346 347 348 349 350 351
	for (i = head->current; i < head->next; ++i)
		n_entries += git_tree_entrycount(head->entries[i]->tree);

	tf = git__calloc(sizeof(tree_iterator_frame) +
		n_entries * sizeof(tree_iterator_entry *), 1);
	GITERR_CHECK_ALLOC(tf);

	tf->n_entries = n_entries;
352

353 354 355
	tf->up     = head;
	head->down = tf;
	ti->head   = tf;
356

357 358
	for (i = head->current, n_entries = 0; i < head->next; ++i) {
		git_tree *tree = head->entries[i]->tree;
359 360 361
		size_t j, max_j = git_tree_entrycount(tree);

		for (j = 0; j < max_j; ++j) {
362 363 364 365 366 367 368 369
			tree_iterator_entry *entry = git_pool_malloc(&ti->pool, 1);
			GITERR_CHECK_ALLOC(entry);

			entry->parent = head->entries[i];
			entry->te     = git_tree_entry_byindex(tree, j);
			entry->tree   = NULL;

			tf->entries[n_entries++] = entry;
370 371
		}
	}
372

373 374
	/* if ignore_case, sort entries case insensitively */
	if (iterator__ignore_case(ti))
375 376 377 378 379 380 381 382 383 384 385
		git__tsort_r(
			(void **)tf->entries, tf->n_entries, tree_iterator__ci_cmp, tf);

	/* pick tf->current based on "start" (or start at zero) */
	if (head->startlen > 0) {
		git__bsearch_r((void **)tf->entries, tf->n_entries, head,
			tree_iterator__search_cmp, ti, &tf->current);

		while (tf->current &&
			   !tree_iterator__search_cmp(head, tf->entries[tf->current-1], ti))
			tf->current--;
386

387 388 389
		if ((tf->start = strchr(head->start, '/')) != NULL) {
			tf->start++;
			tf->startlen = strlen(tf->start);
390
		}
391 392
	}

393
	ti->path_has_filename = ti->entry_is_current = false;
394

395
	if ((error = tree_iterator__set_next(ti, tf)) < 0)
396
		return error;
397

398
	/* autoexpand as needed */
399 400
	if (!iterator__include_trees(ti) && tree_iterator__at_tree(ti))
		return tree_iterator__push_frame(ti);
401

402 403
	return 0;
}
404

405
static bool tree_iterator__pop_frame(tree_iterator *ti, bool final)
406
{
407
	tree_iterator_frame *tf = ti->head;
408

409
	if (!tf->up)
410
		return false;
411

412 413 414
	ti->head = tf->up;
	ti->head->down = NULL;

415
	tree_iterator__move_to_next(ti, tf);
416

417 418 419 420
	if (!final) { /* if final, don't bother to clean up */
		git_pool_free_array(&ti->pool, tf->n_entries, (void **)tf->entries);
		git_buf_rtruncate_at_char(&ti->path, '/');
	}
421

422
	git__free(tf);
423

424 425
	return true;
}
426

427
static void tree_iterator__pop_all(tree_iterator *ti, bool to_end, bool final)
428 429 430 431 432 433 434 435 436 437
{
	while (tree_iterator__pop_frame(ti, final)) /* pop to root */;

	if (!final) {
		ti->head->current = to_end ? ti->head->n_entries : 0;
		ti->path_ambiguities = 0;
		git_buf_clear(&ti->path);
	}
}

438
static int tree_iterator__update_entry(tree_iterator *ti)
439
{
440 441
	tree_iterator_frame *tf;
    const git_tree_entry *te;
442

443 444
	if (ti->entry_is_current)
        return 0;
445

446 447
	tf = ti->head;
    te = tf->entries[tf->current]->te;
448

449 450 451 452
	ti->entry.mode = te->attr;
	git_oid_cpy(&ti->entry.oid, &te->oid);

	ti->entry.path = tree_iterator__current_filename(ti, te);
453
	GITERR_CHECK_ALLOC(ti->entry.path);
454

455 456 457
	if (ti->path_ambiguities > 0)
		tree_iterator__rewrite_filename(ti);

458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481
	if (iterator__past_end(ti, ti->entry.path)) {
		tree_iterator__pop_all(ti, true, false);
		return GIT_ITEROVER;
	}

	ti->entry_is_current = true;

	return 0;
}

static int tree_iterator__current(
	const git_index_entry **entry, git_iterator *self)
{
	int error;
	tree_iterator *ti = (tree_iterator *)self;
	tree_iterator_frame *tf = ti->head;

	iterator__clear_entry(entry);

	if (tf->current >= tf->n_entries)
		return GIT_ITEROVER;

	if ((error = tree_iterator__update_entry(ti)) < 0)
		return error;
482

483 484 485
	if (entry)
		*entry = &ti->entry;

486 487
	ti->base.flags |= GIT_ITERATOR_FIRST_ACCESS;

488
	return 0;
489 490
}

491 492 493 494 495 496
static int tree_iterator__advance_into(
	const git_index_entry **entry, git_iterator *self)
{
	int error = 0;
	tree_iterator *ti = (tree_iterator *)self;

497
	iterator__clear_entry(entry);
498

499 500 501 502
	if (tree_iterator__at_tree(ti))
		error = tree_iterator__push_frame(ti);

	if (!error && entry)
503 504 505 506 507
		error = tree_iterator__current(entry, self);

	return error;
}

508
static int tree_iterator__advance(
509
	const git_index_entry **entry, git_iterator *self)
510
{
511
	int error;
512
	tree_iterator *ti = (tree_iterator *)self;
513
	tree_iterator_frame *tf = ti->head;
514

515
	iterator__clear_entry(entry);
516

517 518 519 520 521
	if (tf->current >= tf->n_entries)
		return GIT_ITEROVER;

	if (!iterator__has_been_accessed(ti))
		return tree_iterator__current(entry, self);
522 523 524

	if (iterator__do_autoexpand(ti) && iterator__include_trees(ti) &&
		tree_iterator__at_tree(ti))
525 526
		return tree_iterator__advance_into(entry, self);

527
	if (ti->path_has_filename) {
528
		git_buf_rtruncate_at_char(&ti->path, '/');
529
		ti->path_has_filename = ti->entry_is_current = false;
530
	}
531

532
	/* scan forward and up, advancing in frame or popping frame when done */
533 534
	while (!tree_iterator__move_to_next(ti, tf) &&
		   tree_iterator__pop_frame(ti, false))
535
		tf = ti->head;
536

537 538 539
	/* find next and load trees */
	if ((error = tree_iterator__set_next(ti, tf)) < 0)
		return error;
540

541 542
	/* deal with include_trees / auto_expand as needed */
	if (!iterator__include_trees(ti) && tree_iterator__at_tree(ti))
543
		return tree_iterator__advance_into(entry, self);
544

545
	return tree_iterator__current(entry, self);
546 547
}

548 549
static int tree_iterator__seek(git_iterator *self, const char *prefix)
{
550
	GIT_UNUSED(self); GIT_UNUSED(prefix);
551 552 553
	return -1;
}

554 555
static int tree_iterator__reset(
	git_iterator *self, const char *start, const char *end)
556
{
557
	tree_iterator *ti = (tree_iterator *)self;
558

559
	tree_iterator__pop_all(ti, false, false);
560

561 562
	if (iterator__reset_range(self, start, end) < 0)
		return -1;
563

564
	return tree_iterator__push_frame(ti); /* re-expand root tree */
565 566
}

567
static int tree_iterator__at_end(git_iterator *self)
568 569
{
	tree_iterator *ti = (tree_iterator *)self;
570 571
	return (ti->head->current >= ti->head->n_entries);
}
572

573 574 575
static void tree_iterator__free(git_iterator *self)
{
	tree_iterator *ti = (tree_iterator *)self;
576

577
	tree_iterator__pop_all(ti, true, false);
578

579 580 581
	git_tree_free(ti->head->entries[0]->tree);
	git__free(ti->head);
	git_pool_clear(&ti->pool);
582
	git_buf_free(&ti->path);
583 584
}

585
static int tree_iterator__create_root_frame(tree_iterator *ti, git_tree *tree)
586 587
{
	size_t sz = sizeof(tree_iterator_frame) + sizeof(tree_iterator_entry);
588 589
	tree_iterator_frame *root = git__calloc(sz, sizeof(char));
	GITERR_CHECK_ALLOC(root);
590

591 592 593 594 595 596 597
	root->n_entries  = 1;
	root->next       = 1;
	root->start      = ti->base.start;
	root->startlen   = root->start ? strlen(root->start) : 0;
	root->entries[0] = git_pool_mallocz(&ti->pool, 1);
	GITERR_CHECK_ALLOC(root->entries[0]);
	root->entries[0]->tree = tree;
598

599
	ti->head = ti->root = root;
600 601 602 603

	return 0;
}

604
int git_iterator_for_tree(
605 606
	git_iterator **iter,
	git_tree *tree,
607
	git_iterator_flag_t flags,
608 609
	const char *start,
	const char *end)
610 611
{
	int error;
612 613 614
	tree_iterator *ti;

	if (tree == NULL)
615
		return git_iterator_for_nothing(iter, flags, start, end);
616

617
	if ((error = git_object_dup((git_object **)&tree, (git_object *)tree)) < 0)
618 619
		return error;

620 621 622
	ti = git__calloc(1, sizeof(tree_iterator));
	GITERR_CHECK_ALLOC(ti);

623
	ITERATOR_BASE_INIT(ti, tree, TREE, git_tree_owner(tree));
624

625
	if ((error = iterator__update_ignore_case((git_iterator *)ti, flags)) < 0)
626
		goto fail;
627
	ti->strncomp = iterator__ignore_case(ti) ? git__strncasecmp : git__strncmp;
628

629 630 631
	if ((error = git_pool_init(&ti->pool, sizeof(tree_iterator_entry),0)) < 0 ||
		(error = tree_iterator__create_root_frame(ti, tree)) < 0 ||
		(error = tree_iterator__push_frame(ti)) < 0) /* expand root now */
632 633 634 635
		goto fail;

	*iter = (git_iterator *)ti;
	return 0;
636

637 638
fail:
	git_iterator_free((git_iterator *)ti);
639 640 641 642 643
	return error;
}


typedef struct {
644
	git_iterator base;
645
	git_iterator_callbacks cb;
646
	git_index *index;
647
	size_t current;
648 649 650 651 652
	/* when not in autoexpand mode, use these to represent "tree" state */
	git_buf partial;
	size_t partial_pos;
	char restore_terminator;
	git_index_entry tree_entry;
653
} index_iterator;
654

655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724
static const git_index_entry *index_iterator__index_entry(index_iterator *ii)
{
	const git_index_entry *ie = git_index_get_byindex(ii->index, ii->current);

	if (ie != NULL && iterator__past_end(ii, ie->path)) {
		ii->current = git_index_entrycount(ii->index);
		ie = NULL;
	}

	return ie;
}

static const git_index_entry *index_iterator__skip_conflicts(index_iterator *ii)
{
	const git_index_entry *ie;

	while ((ie = index_iterator__index_entry(ii)) != NULL &&
		   git_index_entry_stage(ie) != 0)
		ii->current++;

	return ie;
}

static void index_iterator__next_prefix_tree(index_iterator *ii)
{
	const char *slash;

	if (!iterator__include_trees(ii))
		return;

	slash = strchr(&ii->partial.ptr[ii->partial_pos], '/');

	if (slash != NULL) {
		ii->partial_pos = (slash - ii->partial.ptr) + 1;
		ii->restore_terminator = ii->partial.ptr[ii->partial_pos];
		ii->partial.ptr[ii->partial_pos] = '\0';
	} else {
		ii->partial_pos = ii->partial.size;
	}

	if (index_iterator__index_entry(ii) == NULL)
		ii->partial_pos = ii->partial.size;
}

static int index_iterator__first_prefix_tree(index_iterator *ii)
{
	const git_index_entry *ie = index_iterator__skip_conflicts(ii);
	const char *scan, *prior, *slash;

	if (!ie || !iterator__include_trees(ii))
		return 0;

	/* find longest common prefix with prior index entry */
	for (scan = slash = ie->path, prior = ii->partial.ptr;
		 *scan && *scan == *prior; ++scan, ++prior)
		if (*scan == '/')
			slash = scan;

	if (git_buf_sets(&ii->partial, ie->path) < 0)
		return -1;

	ii->partial_pos = (slash - ie->path) + 1;
	index_iterator__next_prefix_tree(ii);

	return 0;
}

#define index_iterator__at_tree(I) \
	(iterator__include_trees(I) && (I)->partial_pos < (I)->partial.size)

725
static int index_iterator__current(
726
	const git_index_entry **entry, git_iterator *self)
727
{
728
	index_iterator *ii = (index_iterator *)self;
Ben Straub committed
729
	const git_index_entry *ie = git_index_get_byindex(ii->index, ii->current);
730

731 732 733 734 735
	if (ie != NULL && index_iterator__at_tree(ii)) {
		ii->tree_entry.path = ii->partial.ptr;
		ie = &ii->tree_entry;
	}

736 737 738
	if (entry)
		*entry = ie;

739 740 741
	ii->base.flags |= GIT_ITERATOR_FIRST_ACCESS;

	return (ie != NULL) ? 0 : GIT_ITEROVER;
742 743
}

744
static int index_iterator__at_end(git_iterator *self)
745
{
746
	index_iterator *ii = (index_iterator *)self;
747 748 749
	return (ii->current >= git_index_entrycount(ii->index));
}

750 751
static int index_iterator__advance(
	const git_index_entry **entry, git_iterator *self)
752
{
753
	index_iterator *ii = (index_iterator *)self;
754
	size_t entrycount = git_index_entrycount(ii->index);
755 756
	const git_index_entry *ie;

757 758 759
	if (!iterator__has_been_accessed(ii))
		return index_iterator__current(entry, self);

760 761 762 763 764
	if (index_iterator__at_tree(ii)) {
		if (iterator__do_autoexpand(ii)) {
			ii->partial.ptr[ii->partial_pos] = ii->restore_terminator;
			index_iterator__next_prefix_tree(ii);
		} else {
765
			/* advance to sibling tree (i.e. find entry with new prefix) */
766 767 768 769 770 771 772
			while (ii->current < entrycount) {
				ii->current++;

				if (!(ie = git_index_get_byindex(ii->index, ii->current)) ||
					ii->base.prefixcomp(ie->path, ii->partial.ptr) != 0)
					break;
			}
773

774 775
			if (index_iterator__first_prefix_tree(ii) < 0)
				return -1;
776
		}
777 778 779
	} else {
		if (ii->current < entrycount)
			ii->current++;
780

781 782
		if (index_iterator__first_prefix_tree(ii) < 0)
			return -1;
783
	}
784 785

	return index_iterator__current(entry, self);
786 787
}

788
static int index_iterator__advance_into(
789
	const git_index_entry **entry, git_iterator *self)
790
{
791
	index_iterator *ii = (index_iterator *)self;
792
	const git_index_entry *ie = git_index_get_byindex(ii->index, ii->current);
793

794 795 796 797 798
	if (ie != NULL && index_iterator__at_tree(ii)) {
		if (ii->restore_terminator)
			ii->partial.ptr[ii->partial_pos] = ii->restore_terminator;
		index_iterator__next_prefix_tree(ii);
	}
799

800
	return index_iterator__current(entry, self);
801 802 803 804
}

static int index_iterator__seek(git_iterator *self, const char *prefix)
{
805
	GIT_UNUSED(self); GIT_UNUSED(prefix);
806
	return -1;
807 808
}

809 810
static int index_iterator__reset(
	git_iterator *self, const char *start, const char *end)
811 812
{
	index_iterator *ii = (index_iterator *)self;
813
	const git_index_entry *ie;
814

815 816
	if (iterator__reset_range(self, start, end) < 0)
		return -1;
817

818 819
	ii->current = ii->base.start ?
		git_index__prefix_position(ii->index, ii->base.start) : 0;
820

821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836
	if ((ie = index_iterator__skip_conflicts(ii)) == NULL)
		return 0;

	if (git_buf_sets(&ii->partial, ie->path) < 0)
		return -1;

	ii->partial_pos = 0;

	if (ii->base.start) {
		size_t startlen = strlen(ii->base.start);

		ii->partial_pos = (startlen > ii->partial.size) ?
			ii->partial.size : startlen;
	}

	index_iterator__next_prefix_tree(ii);
837

838
	return 0;
839 840
}

841
static void index_iterator__free(git_iterator *self)
842
{
843
	index_iterator *ii = (index_iterator *)self;
844
	git_index_free(ii->index);
845
	ii->index = NULL;
846 847

	git_buf_free(&ii->partial);
848 849
}

850
int git_iterator_for_index(
851
	git_iterator **iter,
852
	git_index  *index,
853
	git_iterator_flag_t flags,
854 855
	const char *start,
	const char *end)
856
{
857 858
	index_iterator *ii = git__calloc(1, sizeof(index_iterator));
	GITERR_CHECK_ALLOC(ii);
859

860
	ITERATOR_BASE_INIT(ii, index, INDEX, git_index_owner(index));
861

862
	if (index->ignore_case) {
863
		ii->base.flags |= GIT_ITERATOR_IGNORE_CASE;
864 865
		ii->base.prefixcomp = git__prefixcmp_icase;
	}
866

867 868
	ii->index = index;
	GIT_REFCOUNT_INC(index);
869

870 871 872
	git_buf_init(&ii->partial, 0);
	ii->tree_entry.mode = GIT_FILEMODE_TREE;

873
	index_iterator__reset((git_iterator *)ii, NULL, NULL);
874

875 876 877
	*iter = (git_iterator *)ii;

	return 0;
878 879 880
}


881 882 883 884 885 886 887
typedef struct fs_iterator_frame fs_iterator_frame;
struct fs_iterator_frame {
	fs_iterator_frame *next;
	git_vector entries;
	size_t index;
};

888 889
typedef struct fs_iterator fs_iterator;
struct fs_iterator {
890 891 892 893 894 895 896
	git_iterator base;
	git_iterator_callbacks cb;
	fs_iterator_frame *stack;
	git_index_entry entry;
	git_buf path;
	size_t root_len;
	int depth;
897

898 899 900
	int (*enter_dir_cb)(fs_iterator *self);
	int (*leave_dir_cb)(fs_iterator *self);
	int (*update_entry_cb)(fs_iterator *self);
901
};
902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919

#define FS_MAX_DEPTH 100

static fs_iterator_frame *fs_iterator__alloc_frame(fs_iterator *fi)
{
	fs_iterator_frame *ff = git__calloc(1, sizeof(fs_iterator_frame));
	git_vector_cmp entry_compare = CASESELECT(
		iterator__ignore_case(fi),
		git_path_with_stat_cmp_icase, git_path_with_stat_cmp);

	if (ff && git_vector_init(&ff->entries, 0, entry_compare) < 0) {
		git__free(ff);
		ff = NULL;
	}

	return ff;
}

920
static void fs_iterator__free_frame(fs_iterator_frame *ff)
921 922 923 924 925 926 927 928
{
	size_t i;
	git_path_with_stat *path;

	git_vector_foreach(&ff->entries, i, path)
		git__free(path);
	git_vector_free(&ff->entries);
	git__free(ff);
929
}
930

931 932 933 934 935 936 937 938 939 940 941
static void fs_iterator__pop_frame(
	fs_iterator *fi, fs_iterator_frame *ff, bool pop_last)
{
	if (fi && fi->stack == ff) {
		if (!ff->next && !pop_last) {
			memset(&fi->entry, 0, sizeof(fi->entry));
			return;
		}

		if (fi->leave_dir_cb)
			(void)fi->leave_dir_cb(fi);
942

943 944 945
		fi->stack = ff->next;
		fi->depth--;
	}
946

947
	fs_iterator__free_frame(ff);
948 949 950
}

static int fs_iterator__update_entry(fs_iterator *fi);
951 952
static int fs_iterator__advance_over(
	const git_index_entry **entry, git_iterator *self);
953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978

static int fs_iterator__entry_cmp(const void *i, const void *item)
{
	const fs_iterator *fi = (const fs_iterator *)i;
	const git_path_with_stat *ps = item;
	return fi->base.prefixcomp(fi->base.start, ps->path);
}

static void fs_iterator__seek_frame_start(
	fs_iterator *fi, fs_iterator_frame *ff)
{
	if (!ff)
		return;

	if (fi->base.start)
		git_vector_bsearch2(
			&ff->index, &ff->entries, fs_iterator__entry_cmp, fi);
	else
		ff->index = 0;
}

static int fs_iterator__expand_dir(fs_iterator *fi)
{
	int error;
	fs_iterator_frame *ff;

979 980 981 982 983 984
	if (fi->depth > FS_MAX_DEPTH) {
		giterr_set(GITERR_REPOSITORY,
			"Directory nesting is too deep (%d)", fi->depth);
		return -1;
	}

985 986 987 988 989 990 991
	ff = fs_iterator__alloc_frame(fi);
	GITERR_CHECK_ALLOC(ff);

	error = git_path_dirload_with_stat(
		fi->path.ptr, fi->root_len, iterator__ignore_case(fi),
		fi->base.start, fi->base.end, &ff->entries);

992 993 994 995 996 997 998
	if (error < 0) {
		fs_iterator__free_frame(ff);
		fs_iterator__advance_over(NULL, (git_iterator *)fi);
		return error;
	}

	if (ff->entries.length == 0) {
999
		fs_iterator__free_frame(ff);
1000 1001 1002 1003 1004 1005 1006
		return GIT_ENOTFOUND;
	}

	fs_iterator__seek_frame_start(fi, ff);

	ff->next  = fi->stack;
	fi->stack = ff;
1007
	fi->depth++;
1008

1009
	if (fi->enter_dir_cb && (error = fi->enter_dir_cb(fi)) < 0)
1010 1011
		return error;

1012 1013 1014 1015 1016 1017 1018
	return fs_iterator__update_entry(fi);
}

static int fs_iterator__current(
	const git_index_entry **entry, git_iterator *self)
{
	fs_iterator *fi = (fs_iterator *)self;
1019 1020
	const git_index_entry *fe = (fi->entry.path == NULL) ? NULL : &fi->entry;

1021
	if (entry)
1022 1023 1024 1025 1026
		*entry = fe;

	fi->base.flags |= GIT_ITERATOR_FIRST_ACCESS;

	return (fe != NULL) ? 0 : GIT_ITEROVER;
1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055
}

static int fs_iterator__at_end(git_iterator *self)
{
	return (((fs_iterator *)self)->entry.path == NULL);
}

static int fs_iterator__advance_into(
	const git_index_entry **entry, git_iterator *iter)
{
	int error = 0;
	fs_iterator *fi = (fs_iterator *)iter;

	iterator__clear_entry(entry);

	/* Allow you to explicitly advance into a commit/submodule (as well as a
	 * tree) to avoid cases where an entry is mislabeled as a submodule in
	 * the working directory.  The fs iterator will never have COMMMIT
	 * entries on it's own, but a wrapper might add them.
	 */
	if (fi->entry.path != NULL &&
		(fi->entry.mode == GIT_FILEMODE_TREE ||
		 fi->entry.mode == GIT_FILEMODE_COMMIT))
		/* returns GIT_ENOTFOUND if the directory is empty */
		error = fs_iterator__expand_dir(fi);

	if (!error && entry)
		error = fs_iterator__current(entry, iter);

1056 1057 1058
	if (!error && !fi->entry.path)
		error = GIT_ITEROVER;

1059 1060 1061
	return error;
}

1062
static int fs_iterator__advance_over(
1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079
	const git_index_entry **entry, git_iterator *self)
{
	int error = 0;
	fs_iterator *fi = (fs_iterator *)self;
	fs_iterator_frame *ff;
	git_path_with_stat *next;

	if (entry != NULL)
		*entry = NULL;

	while (fi->entry.path != NULL) {
		ff   = fi->stack;
		next = git_vector_get(&ff->entries, ++ff->index);

		if (next != NULL)
			break;

1080
		fs_iterator__pop_frame(fi, ff, false);
1081 1082 1083 1084 1085 1086 1087 1088 1089 1090
	}

	error = fs_iterator__update_entry(fi);

	if (!error && entry != NULL)
		error = fs_iterator__current(entry, self);

	return error;
}

1091 1092 1093 1094 1095
static int fs_iterator__advance(
	const git_index_entry **entry, git_iterator *self)
{
	fs_iterator *fi = (fs_iterator *)self;

1096 1097 1098
	if (!iterator__has_been_accessed(fi))
		return fs_iterator__current(entry, self);

1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113
	/* given include_trees & autoexpand, we might have to go into a tree */
	if (iterator__do_autoexpand(fi) &&
		fi->entry.path != NULL &&
		fi->entry.mode == GIT_FILEMODE_TREE)
	{
		int error = fs_iterator__advance_into(entry, self);
		if (error != GIT_ENOTFOUND)
			return error;
		/* continue silently past empty directories if autoexpanding */
		giterr_clear();
	}

	return fs_iterator__advance_over(entry, self);
}

1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126
static int fs_iterator__seek(git_iterator *self, const char *prefix)
{
	GIT_UNUSED(self);
	GIT_UNUSED(prefix);
	/* pop stack until matching prefix */
	/* find prefix item in current frame */
	/* push subdirectories as deep as possible while matching */
	return 0;
}

static int fs_iterator__reset(
	git_iterator *self, const char *start, const char *end)
{
1127
	int error;
1128 1129
	fs_iterator *fi = (fs_iterator *)self;

1130 1131
	while (fi->stack != NULL && fi->stack->next != NULL)
		fs_iterator__pop_frame(fi, fi->stack, false);
1132 1133
	fi->depth = 0;

1134 1135
	if ((error = iterator__reset_range(self, start, end)) < 0)
		return error;
1136 1137 1138

	fs_iterator__seek_frame_start(fi, fi->stack);

1139 1140 1141 1142 1143
	error = fs_iterator__update_entry(fi);
	if (error == GIT_ITEROVER)
		error = 0;

	return error;
1144 1145 1146 1147 1148 1149
}

static void fs_iterator__free(git_iterator *self)
{
	fs_iterator *fi = (fs_iterator *)self;

1150 1151
	while (fi->stack != NULL)
		fs_iterator__pop_frame(fi, fi->stack, true);
1152 1153 1154 1155 1156 1157

	git_buf_free(&fi->path);
}

static int fs_iterator__update_entry(fs_iterator *fi)
{
1158
	git_path_with_stat *ps;
1159 1160 1161

	memset(&fi->entry, 0, sizeof(fi->entry));

1162 1163 1164 1165
	if (!fi->stack)
		return GIT_ITEROVER;

	ps = git_vector_get(&fi->stack->entries, fi->stack->index);
1166
	if (!ps)
1167 1168 1169
		return GIT_ITEROVER;

	git_buf_truncate(&fi->path, fi->root_len);
1170 1171
	if (git_buf_put(&fi->path, ps->path, ps->path_len) < 0)
		return -1;
1172

1173
	if (iterator__past_end(fi, fi->path.ptr + fi->root_len))
1174
		return GIT_ITEROVER;
1175 1176 1177 1178 1179 1180 1181

	fi->entry.path = ps->path;
	git_index_entry__init_from_stat(&fi->entry, &ps->st);

	/* need different mode here to keep directories during iteration */
	fi->entry.mode = git_futils_canonical_mode(ps->st.st_mode);

1182
	/* allow wrapper to check/update the entry (can force skip) */
1183 1184
	if (fi->update_entry_cb &&
		fi->update_entry_cb(fi) == GIT_ENOTFOUND)
1185
		return fs_iterator__advance_over(NULL, (git_iterator *)fi);
1186

1187
	/* if this is a tree and trees aren't included, then skip */
1188 1189 1190 1191 1192 1193 1194
	if (fi->entry.mode == GIT_FILEMODE_TREE && !iterator__include_trees(fi)) {
		int error = fs_iterator__advance_into(NULL, (git_iterator *)fi);
		if (error != GIT_ENOTFOUND)
			return error;
		giterr_clear();
		return fs_iterator__advance_over(NULL, (git_iterator *)fi);
	}
1195

1196
	return 0;
1197 1198
}

1199 1200
static int fs_iterator__initialize(
	git_iterator **out, fs_iterator *fi, const char *root)
1201 1202 1203 1204 1205 1206 1207 1208 1209
{
	int error;

	if (git_buf_sets(&fi->path, root) < 0 || git_path_to_dir(&fi->path) < 0) {
		git__free(fi);
		return -1;
	}
	fi->root_len = fi->path.size;

1210 1211 1212 1213 1214 1215 1216 1217
	if ((error = fs_iterator__expand_dir(fi)) < 0) {
		if (error == GIT_ENOTFOUND || error == GIT_ITEROVER) {
			giterr_clear();
			error = 0;
		} else {
			git_iterator_free((git_iterator *)fi);
			fi = NULL;
		}
1218 1219 1220 1221 1222 1223
	}

	*out = (git_iterator *)fi;
	return error;
}

1224 1225 1226 1227 1228 1229 1230 1231 1232
int git_iterator_for_filesystem(
	git_iterator **out,
	const char *root,
	git_iterator_flag_t flags,
	const char *start,
	const char *end)
{
	fs_iterator *fi = git__calloc(1, sizeof(fs_iterator));
	GITERR_CHECK_ALLOC(fi);
1233

1234 1235 1236 1237 1238 1239 1240
	ITERATOR_BASE_INIT(fi, fs, FS, NULL);

	if ((flags & GIT_ITERATOR_IGNORE_CASE) != 0)
		fi->base.flags |= GIT_ITERATOR_IGNORE_CASE;

	return fs_iterator__initialize(out, fi, root);
}
1241

1242

1243
typedef struct {
1244
	fs_iterator fi;
1245 1246
	git_ignores ignores;
	int is_ignored;
1247 1248
} workdir_iterator;

1249
GIT_INLINE(bool) workdir_path_is_dotgit(const git_buf *path)
1250
{
1251
	size_t len;
1252

1253 1254
	if (!path || (len = path->size) < 4)
		return false;
1255

1256 1257
	if (path->ptr[len - 1] == '/')
		len--;
1258

1259 1260 1261 1262 1263
	if (tolower(path->ptr[len - 1]) != 't' ||
		tolower(path->ptr[len - 2]) != 'i' ||
		tolower(path->ptr[len - 3]) != 'g' ||
		tolower(path->ptr[len - 4]) != '.')
		return false;
1264

1265
	return (len == 4 || path->ptr[len - 5] == '/');
1266 1267
}

1268
static int workdir_iterator__enter_dir(fs_iterator *fi)
1269
{
1270
	/* only push new ignores if this is not top level directory */
1271 1272 1273
	if (fi->stack->next != NULL) {
		workdir_iterator *wi = (workdir_iterator *)fi;
		ssize_t slash_pos = git_buf_rfind_next(&fi->path, '/');
1274

1275 1276
		(void)git_ignore__push_dir(&wi->ignores, &fi->path.ptr[slash_pos + 1]);
	}
1277

1278
	return 0;
1279 1280
}

1281
static int workdir_iterator__leave_dir(fs_iterator *fi)
1282
{
1283 1284 1285
	workdir_iterator *wi = (workdir_iterator *)fi;
	git_ignore__pop_dir(&wi->ignores);
	return 0;
1286 1287
}

1288
static int workdir_iterator__update_entry(fs_iterator *fi)
1289 1290
{
	int error = 0;
1291
	workdir_iterator *wi = (workdir_iterator *)fi;
1292

1293 1294 1295
	/* skip over .git entries */
	if (workdir_path_is_dotgit(&fi->path))
		return GIT_ENOTFOUND;
1296

1297 1298
	/* reset is_ignored since we haven't checked yet */
	wi->is_ignored = -1;
1299

1300 1301 1302
	/* check if apparent tree entries are actually submodules */
	if (fi->entry.mode != GIT_FILEMODE_TREE)
		return 0;
1303

1304 1305
	error = git_submodule_lookup(NULL, fi->base.repo, fi->entry.path);
	if (error < 0)
1306
		giterr_clear();
1307

1308 1309 1310 1311
	/* mark submodule (or any dir with .git) as GITLINK and remove slash */
	if (!error || error == GIT_EEXISTS) {
		fi->entry.mode = S_IFGITLINK;
		fi->entry.path[strlen(fi->entry.path) - 1] = '\0';
1312 1313
	}

1314 1315 1316
	return 0;
}

1317
static void workdir_iterator__free(git_iterator *self)
1318
{
1319
	workdir_iterator *wi = (workdir_iterator *)self;
1320
	fs_iterator__free(self);
1321 1322 1323
	git_ignore__free(&wi->ignores);
}

1324
int git_iterator_for_workdir_ext(
1325
	git_iterator **out,
1326
	git_repository *repo,
1327
	const char *repo_workdir,
1328
	git_iterator_flag_t flags,
1329 1330
	const char *start,
	const char *end)
1331 1332
{
	int error;
1333
	workdir_iterator *wi;
1334

1335 1336 1337 1338 1339
	if (!repo_workdir) {
		if (git_repository__ensure_not_bare(repo, "scan working directory") < 0)
			return GIT_EBAREREPO;
		repo_workdir = git_repository_workdir(repo);
	}
1340

1341
	/* initialize as an fs iterator then do overrides */
1342 1343
	wi = git__calloc(1, sizeof(workdir_iterator));
	GITERR_CHECK_ALLOC(wi);
1344
	ITERATOR_BASE_INIT((&wi->fi), fs, FS, repo);
1345

1346 1347 1348 1349 1350
	wi->fi.base.type = GIT_ITERATOR_TYPE_WORKDIR;
	wi->fi.cb.free = workdir_iterator__free;
	wi->fi.enter_dir_cb = workdir_iterator__enter_dir;
	wi->fi.leave_dir_cb = workdir_iterator__leave_dir;
	wi->fi.update_entry_cb = workdir_iterator__update_entry;
1351

1352 1353
	if ((error = iterator__update_ignore_case((git_iterator *)wi, flags)) < 0 ||
		(error = git_ignore__for_path(repo, "", &wi->ignores)) < 0)
1354
	{
1355 1356
		git_iterator_free((git_iterator *)wi);
		return error;
1357 1358
	}

1359
	return fs_iterator__initialize(out, &wi->fi, repo_workdir);
1360 1361
}

1362

1363
void git_iterator_free(git_iterator *iter)
1364
{
1365
	if (iter == NULL)
1366 1367
		return;

1368
	iter->cb->free(iter);
1369

1370 1371
	git__free(iter->start);
	git__free(iter->end);
1372

1373 1374 1375
	memset(iter, 0, sizeof(*iter));

	git__free(iter);
1376 1377
}

1378
int git_iterator_set_ignore_case(git_iterator *iter, bool ignore_case)
1379
{
1380
	bool desire_ignore_case  = (ignore_case != 0);
1381

1382
	if (iterator__ignore_case(iter) == desire_ignore_case)
1383
		return 0;
1384

1385
	if (iter->type == GIT_ITERATOR_TYPE_EMPTY) {
1386 1387 1388 1389 1390 1391 1392 1393
		if (desire_ignore_case)
			iter->flags |= GIT_ITERATOR_IGNORE_CASE;
		else
			iter->flags &= ~GIT_ITERATOR_IGNORE_CASE;
	} else {
		giterr_set(GITERR_INVALID,
			"Cannot currently set ignore case on non-empty iterators");
		return -1;
1394 1395 1396
	}

	return 0;
1397 1398
}

1399
git_index *git_iterator_get_index(git_iterator *iter)
1400
{
1401
	if (iter->type == GIT_ITERATOR_TYPE_INDEX)
1402 1403 1404 1405
		return ((index_iterator *)iter)->index;
	return NULL;
}

1406
int git_iterator_current_tree_entry(
1407
	const git_tree_entry **tree_entry, git_iterator *iter)
1408
{
1409 1410 1411
	if (iter->type != GIT_ITERATOR_TYPE_TREE)
		*tree_entry = NULL;
	else {
1412
		tree_iterator_frame *tf = ((tree_iterator *)iter)->head;
1413 1414
		*tree_entry = (tf->current < tf->n_entries) ?
			tf->entries[tf->current]->te : NULL;
1415 1416
	}

1417
	return 0;
1418 1419
}

1420
int git_iterator_current_parent_tree(
1421
	const git_tree **tree_ptr,
1422
	git_iterator *iter,
1423
	const char *parent_path)
1424 1425 1426 1427
{
	tree_iterator *ti = (tree_iterator *)iter;
	tree_iterator_frame *tf;
	const char *scan = parent_path;
1428
	const git_tree_entry *te;
1429

1430
	*tree_ptr = NULL;
1431

1432 1433
	if (iter->type != GIT_ITERATOR_TYPE_TREE)
		return 0;
1434

1435 1436 1437 1438
	for (tf = ti->root; *scan; ) {
		if (!(tf = tf->down) ||
			tf->current >= tf->n_entries ||
			!(te = tf->entries[tf->current]->te) ||
1439
			ti->strncomp(scan, te->filename, te->filename_len) != 0)
1440 1441 1442
			return 0;

		scan += te->filename_len;
1443
		if (*scan == '/')
1444 1445 1446
			scan++;
	}

1447
	*tree_ptr = tf->entries[tf->current]->tree;
1448 1449 1450
	return 0;
}

1451
bool git_iterator_current_is_ignored(git_iterator *iter)
1452
{
1453 1454
	workdir_iterator *wi = (workdir_iterator *)iter;

1455
	if (iter->type != GIT_ITERATOR_TYPE_WORKDIR)
1456
		return false;
1457 1458

	if (wi->is_ignored != -1)
1459
		return (bool)(wi->is_ignored != 0);
1460

1461 1462
	if (git_ignore__lookup(
			&wi->ignores, wi->fi.entry.path, &wi->is_ignored) < 0)
1463
		wi->is_ignored = true;
1464

1465
	return (bool)wi->is_ignored;
1466 1467
}

1468
int git_iterator_cmp(git_iterator *iter, const char *path_prefix)
1469 1470 1471 1472
{
	const git_index_entry *entry;

	/* a "done" iterator is after every prefix */
1473
	if (git_iterator_current(&entry, iter) < 0 || entry == NULL)
1474 1475 1476 1477 1478 1479
		return 1;

	/* a NULL prefix is after any valid iterator */
	if (!path_prefix)
		return -1;

1480
	return iter->prefixcomp(entry->path, path_prefix);
1481 1482
}

1483
int git_iterator_current_workdir_path(git_buf **path, git_iterator *iter)
1484 1485 1486
{
	workdir_iterator *wi = (workdir_iterator *)iter;

1487
	if (iter->type != GIT_ITERATOR_TYPE_WORKDIR || !wi->fi.entry.path)
1488 1489
		*path = NULL;
	else
1490
		*path = &wi->fi.path;
1491 1492 1493

	return 0;
}