iterator.c 55.5 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 13 14
#define GIT_ITERATOR_FIRST_ACCESS   (1 << 15)
#define GIT_ITERATOR_HONOR_IGNORES  (1 << 16)
#define GIT_ITERATOR_IGNORE_DOT_GIT (1 << 17)
15

16 17 18 19 20 21
#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)
#define iterator__include_conflicts(I) iterator__flag(I,INCLUDE_CONFLICTS)
22
#define iterator__has_been_accessed(I) iterator__flag(I,FIRST_ACCESS)
23 24
#define iterator__honor_ignores(I)     iterator__flag(I,HONOR_IGNORES)
#define iterator__ignore_dot_git(I)    iterator__flag(I,IGNORE_DOT_GIT)
25

26

Edward Thomson committed
27
static void iterator_set_ignore_case(git_iterator *iter, bool ignore_case)
28
{
Edward Thomson committed
29 30 31 32
	if (ignore_case)
		iter->flags |= GIT_ITERATOR_IGNORE_CASE;
	else
		iter->flags &= ~GIT_ITERATOR_IGNORE_CASE;
33

Edward Thomson committed
34 35 36
	iter->strcomp = ignore_case ? git__strcasecmp : git__strcmp;
	iter->strncomp = ignore_case ? git__strncasecmp : git__strncmp;
	iter->prefixcomp = ignore_case ? git__prefixcmp_icase : git__prefixcmp;
37
	iter->entry_srch = ignore_case ? git_index_entry_isrch : git_index_entry_srch;
38 39

	git_vector_set_cmp(&iter->pathlist, (git_vector_cmp)iter->strcomp);
40
}
41

42 43 44
static int iterator_range_init(
	git_iterator *iter, const char *start, const char *end)
{
45
	if (start && *start) {
46 47
		iter->start = git__strdup(start);
		GITERR_CHECK_ALLOC(iter->start);
48 49

		iter->start_len = strlen(iter->start);
50 51
	}

52
	if (end && *end) {
53 54
		iter->end = git__strdup(end);
		GITERR_CHECK_ALLOC(iter->end);
55 56

		iter->end_len = strlen(iter->end);
57 58 59 60 61 62 63 64 65 66 67 68 69
	}

	iter->started = (iter->start == NULL);
	iter->ended = false;

	return 0;
}

static void iterator_range_free(git_iterator *iter)
{
	if (iter->start) {
		git__free(iter->start);
		iter->start = NULL;
70
		iter->start_len = 0;
71 72 73 74 75
	}

	if (iter->end) {
		git__free(iter->end);
		iter->end = NULL;
76
		iter->end_len = 0;
77 78 79
	}
}

Edward Thomson committed
80
static int iterator_reset_range(
81 82 83 84 85 86 87 88 89 90
	git_iterator *iter, const char *start, const char *end)
{
	iterator_range_free(iter);
	return iterator_range_init(iter, start, end);
}

static int iterator_pathlist_init(git_iterator *iter, git_strarray *pathlist)
{
	size_t i;

Edward Thomson committed
91
	if (git_vector_init(&iter->pathlist, pathlist->count, NULL) < 0)
92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107
		return -1;

	for (i = 0; i < pathlist->count; i++) {
		if (!pathlist->strings[i])
			continue;

		if (git_vector_insert(&iter->pathlist, pathlist->strings[i]) < 0)
			return -1;
	}

	return 0;
}

static int iterator_init_common(
	git_iterator *iter,
	git_repository *repo,
108
	git_index *index,
109 110 111 112 113
	git_iterator_options *given_opts)
{
	static git_iterator_options default_opts = GIT_ITERATOR_OPTIONS_INIT;
	git_iterator_options *options = given_opts ? given_opts : &default_opts;
	bool ignore_case;
114
	int precompose;
115 116 117
	int error;

	iter->repo = repo;
118
	iter->index = index;
119 120 121 122 123 124
	iter->flags = options->flags;

	if ((iter->flags & GIT_ITERATOR_IGNORE_CASE) != 0) {
		ignore_case = true;
	} else if ((iter->flags & GIT_ITERATOR_DONT_IGNORE_CASE) != 0) {
		ignore_case = false;
125
	} else if (repo) {
126 127 128 129 130 131 132 133 134 135 136
		git_index *index;

		if ((error = git_repository_index__weakptr(&index, iter->repo)) < 0)
			return error;

		ignore_case = !!index->ignore_case;

		if (ignore_case == 1)
			iter->flags |= GIT_ITERATOR_IGNORE_CASE;
		else
			iter->flags |= GIT_ITERATOR_DONT_IGNORE_CASE;
137 138 139 140 141 142 143 144 145 146 147 148 149
	} else {
		ignore_case = false;
	}

	/* try to look up precompose and set flag if appropriate */
	if (repo &&
		(iter->flags & GIT_ITERATOR_PRECOMPOSE_UNICODE) == 0 &&
		(iter->flags & GIT_ITERATOR_DONT_PRECOMPOSE_UNICODE) == 0) {

		if (git_repository__cvar(&precompose, repo, GIT_CVAR_PRECOMPOSE) < 0)
			giterr_clear();
		else if (precompose)
			iter->flags |= GIT_ITERATOR_PRECOMPOSE_UNICODE;
150 151 152 153 154 155 156 157 158
	}

	if ((iter->flags & GIT_ITERATOR_DONT_AUTOEXPAND))
		iter->flags |= GIT_ITERATOR_INCLUDE_TREES;

	if ((error = iterator_range_init(iter, options->start, options->end)) < 0 ||
		(error = iterator_pathlist_init(iter, &options->pathlist)) < 0)
		return error;

Edward Thomson committed
159
	iterator_set_ignore_case(iter, ignore_case);
160 161 162 163 164 165 166
	return 0;
}

static void iterator_clear(git_iterator *iter)
{
	iter->started = false;
	iter->ended = false;
167
	iter->stat_calls = 0;
168 169 170 171
	iter->pathlist_walk_idx = 0;
	iter->flags &= ~GIT_ITERATOR_FIRST_ACCESS;
}

172 173
GIT_INLINE(bool) iterator_has_started(
	git_iterator *iter, const char *path, bool is_submodule)
174 175 176 177 178 179 180 181 182 183 184
{
	size_t path_len;

	if (iter->start == NULL || iter->started == true)
		return true;

	/* the starting path is generally a prefix - we have started once we
	 * are prefixed by this path
	 */
	iter->started = (iter->prefixcomp(path, iter->start) >= 0);

185 186 187 188 189 190 191 192 193 194 195 196 197
	if (iter->started)
		return true;

	path_len = strlen(path);

	/* if, however, we are a submodule, then we support `start` being
	 * suffixed with a `/` for crazy legacy reasons.  match `submod`
	 * with a start path of `submod/`.
	 */
	if (is_submodule && iter->start_len && path_len == iter->start_len - 1 &&
		iter->start[iter->start_len-1] == '/')
		return true;

198 199 200 201
	/* if, however, our current path is a directory, and our starting path
	 * is _beneath_ that directory, then recurse into the directory (even
	 * though we have not yet "started")
	 */
202
	if (path_len > 0 && path[path_len-1] == '/' &&
203 204 205
		iter->strncomp(path, iter->start, path_len) == 0)
		return true;

206
	return false;
207 208
}

209
GIT_INLINE(bool) iterator_has_ended(git_iterator *iter, const char *path)
210
{
211
	if (iter->end == NULL)
212
		return false;
213 214
	else if (iter->ended)
		return true;
215 216 217 218 219

	iter->ended = (iter->prefixcomp(path, iter->end) > 0);
	return iter->ended;
}

220 221
/* walker for the index and tree iterator that allows it to walk the sorted
 * pathlist entries alongside sorted iterator entries.
222
 */
223
static bool iterator_pathlist_next_is(git_iterator *iter, const char *path)
224 225 226 227 228 229 230 231
{
	char *p;
	size_t path_len, p_len, cmp_len, i;
	int cmp;

	if (iter->pathlist.length == 0)
		return true;

Edward Thomson committed
232 233
	git_vector_sort(&iter->pathlist);

234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273
	path_len = strlen(path);

	/* for comparison, drop the trailing slash on the current '/' */
	if (path_len && path[path_len-1] == '/')
		path_len--;

	for (i = iter->pathlist_walk_idx; i < iter->pathlist.length; i++) {
		p = iter->pathlist.contents[i];
		p_len = strlen(p);

		if (p_len && p[p_len-1] == '/')
			p_len--;

		cmp_len = min(path_len, p_len);

		/* see if the pathlist entry is a prefix of this path */
		cmp = iter->strncomp(p, path, cmp_len);

		/* prefix match - see if there's an exact match, or if we were
		 * given a path that matches the directory
		 */
		if (cmp == 0) {
			/* if this pathlist entry is not suffixed with a '/' then
			 * it matches a path that is a file or a directory.
			 * (eg, pathlist = "foo" and path is "foo" or "foo/" or
			 * "foo/something")
			 */
			if (p[cmp_len] == '\0' &&
				(path[cmp_len] == '\0' || path[cmp_len] == '/'))
				return true;

			/* if this pathlist entry _is_ suffixed with a '/' then
			 * it matches only paths that are directories.
			 * (eg, pathlist = "foo/" and path is "foo/" or "foo/something")
			 */
			if (p[cmp_len] == '/' && path[cmp_len] == '/')
				return true;
		}

		/* this pathlist entry sorts before the given path, try the next */
274
		else if (cmp < 0) {
275 276 277 278 279 280 281 282 283 284 285 286 287
			iter->pathlist_walk_idx++;
			continue;
		}

		/* this pathlist sorts after the given path, no match. */
		else if (cmp > 0) {
			break;
		}
	}

	return false;
}

288
typedef enum {
Edward Thomson committed
289
	ITERATOR_PATHLIST_NONE = 0,
290 291 292 293 294 295 296 297 298 299 300 301 302
	ITERATOR_PATHLIST_IS_FILE = 1,
	ITERATOR_PATHLIST_IS_DIR = 2,
	ITERATOR_PATHLIST_IS_PARENT = 3,
	ITERATOR_PATHLIST_FULL = 4,
} iterator_pathlist_search_t;

static iterator_pathlist_search_t iterator_pathlist_search(
	git_iterator *iter, const char *path, size_t path_len)
{
	const char *p;
	size_t idx;
	int error;

Edward Thomson committed
303 304 305 306 307
	if (iter->pathlist.length == 0)
		return ITERATOR_PATHLIST_FULL;

	git_vector_sort(&iter->pathlist);

308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345
	error = git_vector_bsearch2(&idx, &iter->pathlist,
		(git_vector_cmp)iter->strcomp, path);

	/* the given path was found in the pathlist.  since the pathlist only
	 * matches directories when they're suffixed with a '/', analyze the
	 * path string to determine whether it's a directory or not.
	 */
	if (error == 0) {
		if (path_len && path[path_len-1] == '/')
			return ITERATOR_PATHLIST_IS_DIR;

		return ITERATOR_PATHLIST_IS_FILE;
	}

	/* at this point, the path we're examining may be a directory (though we
	 * don't know that yet, since we're avoiding a stat unless it's necessary)
	 * so walk the pathlist looking for the given path with a '/' after it,
	 */
	while ((p = git_vector_get(&iter->pathlist, idx)) != NULL) {
		if (iter->prefixcomp(p, path) != 0)
			break;

		/* an exact match would have been matched by the bsearch above */
		assert(p[path_len]);

		/* is this a literal directory entry (eg `foo/`) or a file beneath */
		if (p[path_len] == '/') {
			return (p[path_len+1] == '\0') ?
				ITERATOR_PATHLIST_IS_DIR :
				ITERATOR_PATHLIST_IS_PARENT;
		}

		if (p[path_len] > '/')
			break;

		idx++;
	}

Edward Thomson committed
346
	return ITERATOR_PATHLIST_NONE;
347 348
}

349 350
/* Empty iterator */

351
static int empty_iterator_noop(const git_index_entry **e, git_iterator *i)
352 353
{
	GIT_UNUSED(i);
Edward Thomson committed
354 355 356 357

	if (e)
		*e = NULL;

358
	return GIT_ITEROVER;
359 360
}

361 362 363 364 365 366
static int empty_iterator_advance_over(
	const git_index_entry **e,
	git_iterator_status_t *s,
	git_iterator *i)
{
	*s = GIT_ITERATOR_STATUS_EMPTY;
Edward Thomson committed
367
	return empty_iterator_noop(e, i);
368 369 370
}

static int empty_iterator_reset(git_iterator *i)
371 372 373 374 375
{
	GIT_UNUSED(i);
	return 0;
}

376
static void empty_iterator_free(git_iterator *i)
377
{
378
	GIT_UNUSED(i);
379 380
}

381 382 383 384 385
typedef struct {
	git_iterator base;
	git_iterator_callbacks cb;
} empty_iterator;

386
int git_iterator_for_nothing(
387
	git_iterator **out,
388
	git_iterator_options *options)
389
{
390 391 392 393 394 395 396 397 398 399
	empty_iterator *iter;

	static git_iterator_callbacks callbacks = {
		empty_iterator_noop,
		empty_iterator_noop,
		empty_iterator_noop,
		empty_iterator_advance_over,
		empty_iterator_reset,
		empty_iterator_free
	};
400

401
	*out = NULL;
402

403 404
	iter = git__calloc(1, sizeof(empty_iterator));
	GITERR_CHECK_ALLOC(iter);
405

406 407 408
	iter->base.type = GIT_ITERATOR_TYPE_EMPTY;
	iter->base.cb = &callbacks;
	iter->base.flags = options->flags;
409

410
	*out = &iter->base;
411 412 413
	return 0;
}

414
/* Tree iterator */
415

416 417 418 419
typedef struct {
	git_tree_entry *tree_entry;
	const char *parent_path;
} tree_iterator_entry;
420

421 422
typedef struct {
	git_tree *tree;
423

424 425 426
	/* path to this particular frame (folder) */
	git_buf path;

427 428 429 430 431
	/* a sorted list of the entries for this frame (folder), these are
	 * actually pointers to the iterator's entry pool.
	 */
	git_vector entries;
	tree_iterator_entry *current;
432

433
	size_t next_idx;
434

435 436 437 438 439
	/* on case insensitive iterations, we also have an array of other
	 * paths that were case insensitively equal to this one, and their
	 * tree objects.  we have coalesced the tree entries into this frame.
	 * a child `tree_iterator_entry` will contain a pointer to its actual
	 * parent path.
440
	 */
441
	git_vector similar_trees;
442 443
	git_array_t(git_buf) similar_paths;
} tree_iterator_frame;
444 445

typedef struct {
446
	git_iterator base;
447 448 449
	git_tree *root;
	git_array_t(tree_iterator_frame) frames;

450
	git_index_entry entry;
451 452 453 454
	git_buf entry_path;

	/* a pool of entries to reduce the number of allocations */
	git_pool entry_pool;
455
} tree_iterator;
456

457 458
GIT_INLINE(tree_iterator_frame *) tree_iterator_parent_frame(
	tree_iterator *iter)
459
{
460 461
	return iter->frames.size > 1 ?
		&iter->frames.ptr[iter->frames.size-2] : NULL;
462 463
}

464 465
GIT_INLINE(tree_iterator_frame *) tree_iterator_current_frame(
	tree_iterator *iter)
466
{
467
	return iter->frames.size ? &iter->frames.ptr[iter->frames.size-1] : NULL;
468
}
469

470 471
GIT_INLINE(int) tree_entry_cmp(
	const git_tree_entry *a, const git_tree_entry *b, bool icase)
472
{
473 474 475
	return git_path_cmp(
		a->filename, a->filename_len, a->attr == GIT_FILEMODE_TREE,
		b->filename, b->filename_len, b->attr == GIT_FILEMODE_TREE,
476
		icase ? git__strncasecmp : git__strncmp);
477 478
}

479
GIT_INLINE(int) tree_iterator_entry_cmp(const void *ptr_a, const void *ptr_b)
480
{
481 482
	const tree_iterator_entry *a = (const tree_iterator_entry *)ptr_a;
	const tree_iterator_entry *b = (const tree_iterator_entry *)ptr_b;
483

484
	return tree_entry_cmp(a->tree_entry, b->tree_entry, false);
485 486
}

487 488
GIT_INLINE(int) tree_iterator_entry_cmp_icase(
	const void *ptr_a, const void *ptr_b)
489
{
490 491
	const tree_iterator_entry *a = (const tree_iterator_entry *)ptr_a;
	const tree_iterator_entry *b = (const tree_iterator_entry *)ptr_b;
492

493
	return tree_entry_cmp(a->tree_entry, b->tree_entry, true);
494 495
}

496
static int tree_iterator_entry_sort_icase(const void *ptr_a, const void *ptr_b)
497
{
498 499
	const tree_iterator_entry *a = (const tree_iterator_entry *)ptr_a;
	const tree_iterator_entry *b = (const tree_iterator_entry *)ptr_b;
500

501
	int c = tree_entry_cmp(a->tree_entry, b->tree_entry, true);
502

503 504 505 506 507 508 509 510 511
	/* stabilize the sort order for filenames that are (case insensitively)
	 * the same by examining the parent path (case sensitively) before
	 * falling back to a case sensitive sort of the filename.
	 */
	if (!c && a->parent_path != b->parent_path)
		c = git__strcmp(a->parent_path, b->parent_path);

	if (!c)
		c = tree_entry_cmp(a->tree_entry, b->tree_entry, false);
512

513
	return c;
514 515
}

516 517 518
static int tree_iterator_compute_path(
	git_buf *out,
	tree_iterator_entry *entry)
519
{
520
	git_buf_clear(out);
521

522 523 524 525
	if (entry->parent_path)
		git_buf_joinpath(out, entry->parent_path, entry->tree_entry->filename);
	else
		git_buf_puts(out, entry->tree_entry->filename);
526

527 528
	if (git_tree_entry__is_tree(entry->tree_entry))
		git_buf_putc(out, '/');
529

530 531
	if (git_buf_oom(out))
		return -1;
532

533
	return 0;
534 535
}

536 537 538 539
static int tree_iterator_frame_init(
	tree_iterator *iter,
	git_tree *tree,
	tree_iterator_entry *frame_entry)
540
{
541 542 543 544 545 546
	tree_iterator_frame *new_frame = NULL;
	tree_iterator_entry *new_entry;
	git_tree *dup = NULL;
	git_tree_entry *tree_entry;
	git_vector_cmp cmp;
	size_t i;
547
	int error = 0;
548

549 550
	new_frame = git_array_alloc(iter->frames);
	GITERR_CHECK_ALLOC(new_frame);
551

552
	memset(new_frame, 0, sizeof(tree_iterator_frame));
553

554 555
	if ((error = git_tree_dup(&dup, tree)) < 0)
		goto done;
556

557 558
	memset(new_frame, 0x0, sizeof(tree_iterator_frame));
	new_frame->tree = dup;
559

560 561 562
	if (frame_entry &&
		(error = tree_iterator_compute_path(&new_frame->path, frame_entry)) < 0)
		goto done;
563

564 565
	cmp = iterator__ignore_case(&iter->base) ?
		tree_iterator_entry_sort_icase : NULL;
566

567 568 569
	if ((error = git_vector_init(
		&new_frame->entries, dup->entries.size, cmp)) < 0)
		goto done;
570

571 572 573
	git_array_foreach(dup->entries, i, tree_entry) {
		new_entry = git_pool_malloc(&iter->entry_pool, 1);
		GITERR_CHECK_ALLOC(new_entry);
574

575 576
		new_entry->tree_entry = tree_entry;
		new_entry->parent_path = new_frame->path.ptr;
577

578 579
		if ((error = git_vector_insert(&new_frame->entries, new_entry)) < 0)
			goto done;
580 581
	}

582 583
	git_vector_set_sorted(&new_frame->entries,
		!iterator__ignore_case(&iter->base));
584

585 586 587 588 589
done:
	if (error < 0) {
		git_tree_free(dup);
		git_array_pop(iter->frames);
	}
590

591 592
	return error;
}
593

594 595 596 597
GIT_INLINE(tree_iterator_entry *) tree_iterator_current_entry(
	tree_iterator_frame *frame)
{
	return frame->current;
598
}
599

600 601 602 603 604
GIT_INLINE(int) tree_iterator_frame_push_neighbors(
	tree_iterator *iter,
	tree_iterator_frame *parent_frame,
	tree_iterator_frame *frame,
	const char *filename)
605
{
606 607 608 609 610 611
	tree_iterator_entry *entry, *new_entry;
	git_tree *tree = NULL;
	git_tree_entry *tree_entry;
	git_buf *path;
	size_t new_size, i;
	int error = 0;
612

613 614
	while (parent_frame->next_idx < parent_frame->entries.length) {
		entry = parent_frame->entries.contents[parent_frame->next_idx];
615

616 617
		if (strcasecmp(filename, entry->tree_entry->filename) != 0)
			break;
618

619 620 621
		if ((error = git_tree_lookup(&tree,
			iter->base.repo, entry->tree_entry->oid)) < 0)
			break;
622

623 624 625
		if (git_vector_insert(&parent_frame->similar_trees, tree) < 0)
			break;

626 627
		path = git_array_alloc(parent_frame->similar_paths);
		GITERR_CHECK_ALLOC(path);
628

629
		memset(path, 0, sizeof(git_buf));
630

631 632
		if ((error = tree_iterator_compute_path(path, entry)) < 0)
			break;
633

634 635 636
		GITERR_CHECK_ALLOC_ADD(&new_size,
			frame->entries.length, tree->entries.size);
		git_vector_size_hint(&frame->entries, new_size);
637

638 639 640 641 642 643
		git_array_foreach(tree->entries, i, tree_entry) {
			new_entry = git_pool_malloc(&iter->entry_pool, 1);
			GITERR_CHECK_ALLOC(new_entry);

			new_entry->tree_entry = tree_entry;
			new_entry->parent_path = path->ptr;
644

645 646 647 648 649 650
			if ((error = git_vector_insert(&frame->entries, new_entry)) < 0)
				break;
		}

		if (error)
			break;
651

652
		parent_frame->next_idx++;
653
	}
654 655

	return error;
656 657
}

658 659
GIT_INLINE(int) tree_iterator_frame_push(
	tree_iterator *iter, tree_iterator_entry *entry)
660
{
661 662 663
	tree_iterator_frame *parent_frame, *frame;
	git_tree *tree = NULL;
	int error;
664

665 666 667 668
	if ((error = git_tree_lookup(&tree,
			iter->base.repo, entry->tree_entry->oid)) < 0 ||
		(error = tree_iterator_frame_init(iter, tree, entry)) < 0)
		goto done;
669

670 671
	parent_frame = tree_iterator_parent_frame(iter);
	frame = tree_iterator_current_frame(iter);
672

673 674 675 676 677 678 679
	/* if we're case insensitive, then we may have another directory that
	 * is (case insensitively) equal to this one.  coalesce those children
	 * into this tree.
	 */
	if (iterator__ignore_case(&iter->base))
		error = tree_iterator_frame_push_neighbors(iter,
			parent_frame, frame, entry->tree_entry->filename);
680

681 682 683 684
done:
	git_tree_free(tree);
	return error;
}
685

686 687 688
static void tree_iterator_frame_pop(tree_iterator *iter)
{
	tree_iterator_frame *frame;
689
	git_buf *buf = NULL;
690 691
	git_tree *tree;
	size_t i;
692

693
	assert(iter->frames.size);
694

695
	frame = git_array_pop(iter->frames);
696

697 698
	git_vector_free(&frame->entries);
	git_tree_free(frame->tree);
699 700 701 702 703 704 705

	do {
		buf = git_array_pop(frame->similar_paths);
		git_buf_free(buf);
	} while (buf != NULL);

	git_array_clear(frame->similar_paths);
706 707 708 709 710 711

	git_vector_foreach(&frame->similar_trees, i, tree)
		git_tree_free(tree);

	git_vector_free(&frame->similar_trees);

712
	git_buf_free(&frame->path);
713 714
}

715 716
static int tree_iterator_current(
	const git_index_entry **out, git_iterator *i)
717
{
718
	tree_iterator *iter = (tree_iterator *)i;
719

720 721
	if (!iterator__has_been_accessed(i))
		return iter->base.cb->advance(out, i);
722

723 724
	if (!iter->frames.size) {
		*out = NULL;
725
		return GIT_ITEROVER;
726
	}
727

728
	*out = &iter->entry;
729
	return 0;
730 731
}

732 733 734 735
static void tree_iterator_set_current(
	tree_iterator *iter,
	tree_iterator_frame *frame,
	tree_iterator_entry *entry)
736
{
737
	git_tree_entry *tree_entry = entry->tree_entry;
738

739
	frame->current = entry;
740

741 742 743 744 745
	memset(&iter->entry, 0x0, sizeof(git_index_entry));

	iter->entry.mode = tree_entry->attr;
	iter->entry.path = iter->entry_path.ptr;
	git_oid_cpy(&iter->entry.id, tree_entry->oid);
746 747
}

748
static int tree_iterator_advance(const git_index_entry **out, git_iterator *i)
749
{
750 751
	tree_iterator *iter = (tree_iterator *)i;
	int error = 0;
752

753
	iter->base.flags |= GIT_ITERATOR_FIRST_ACCESS;
754

755 756 757 758 759 760 761 762 763 764
	/* examine tree entries until we find the next one to return */
	while (true) {
		tree_iterator_entry *prev_entry, *entry;
		tree_iterator_frame *frame;
		bool is_tree;

		if ((frame = tree_iterator_current_frame(iter)) == NULL) {
			error = GIT_ITEROVER;
			break;
		}
765

766 767 768 769 770
		/* no more entries in this frame.  pop the frame out */
		if (frame->next_idx == frame->entries.length) {
			tree_iterator_frame_pop(iter);
			continue;
		}
771

772 773 774 775 776
		/* we may have coalesced the contents of case-insensitively same-named
		 * directories, so do the sort now.
		 */
		if (frame->next_idx == 0 && !git_vector_is_sorted(&frame->entries))
			git_vector_sort(&frame->entries);
777

778 779 780 781
		/* we have more entries in the current frame, that's our next entry */
		prev_entry = tree_iterator_current_entry(frame);
		entry = frame->entries.contents[frame->next_idx];
		frame->next_idx++;
782

783 784 785 786 787 788 789
		/* we can have collisions when iterating case insensitively.  (eg,
		 * 'A/a' and 'a/A').  squash this one if it's already been seen.
		 */
		if (iterator__ignore_case(&iter->base) &&
			prev_entry &&
			tree_iterator_entry_cmp_icase(prev_entry, entry) == 0)
			continue;
790

791 792
		if ((error = tree_iterator_compute_path(&iter->entry_path, entry)) < 0)
			break;
793

794
		/* if this path is before our start, advance over this entry */
795
		if (!iterator_has_started(&iter->base, iter->entry_path.ptr, false))
796
			continue;
797

798
		/* if this path is after our end, stop */
799
		if (iterator_has_ended(&iter->base, iter->entry_path.ptr)) {
800 801 802
			error = GIT_ITEROVER;
			break;
		}
803

804
		/* if we have a list of paths we're interested in, examine it */
805
		if (!iterator_pathlist_next_is(&iter->base, iter->entry_path.ptr))
806
			continue;
807

808
		is_tree = git_tree_entry__is_tree(entry->tree_entry);
809

810 811
		/* if we are *not* including trees then advance over this entry */
		if (is_tree && !iterator__include_trees(iter)) {
812

813 814 815 816 817 818 819
			/* if we've found a tree (and are not returning it to the caller)
			 * and we are autoexpanding, then we want to return the first
			 * child.  push the new directory and advance.
			 */
			if (iterator__do_autoexpand(iter)) {
				if ((error = tree_iterator_frame_push(iter, entry)) < 0)
					break;
820
			}
821 822

			continue;
823
		}
824 825 826 827 828 829 830 831 832 833 834

		tree_iterator_set_current(iter, frame, entry);

		/* if we are autoexpanding, then push this as a new frame, so that
		 * the next call to `advance` will dive into this directory.
		 */
		if (is_tree && iterator__do_autoexpand(iter))
			error = tree_iterator_frame_push(iter, entry);

		break;
	}
835 836

	if (out)
837
		*out = (error == 0) ? &iter->entry : NULL;
838 839 840 841

	return error;
}

842 843
static int tree_iterator_advance_into(
	const git_index_entry **out, git_iterator *i)
844
{
845 846 847 848
	tree_iterator *iter = (tree_iterator *)i;
    tree_iterator_frame *frame;
	tree_iterator_entry *prev_entry;
	int error;
849

850 851
	if (out)
		*out = NULL;
852

853 854 855 856 857 858 859 860 861 862 863 864 865 866 867
	if ((frame = tree_iterator_current_frame(iter)) == NULL)
		return GIT_ITEROVER;

	/* get the last seen entry */
	prev_entry = tree_iterator_current_entry(frame);

	/* it's legal to call advance_into when auto-expand is on.  in this case,
	 * we will have pushed a new (empty) frame on to the stack for this
	 * new directory.  since it's empty, its current_entry should be null.
	 */
	assert(iterator__do_autoexpand(i) ^ (prev_entry != NULL));

	if (prev_entry) {
		if (!git_tree_entry__is_tree(prev_entry->tree_entry))
			return 0;
868

869 870 871 872 873 874 875 876
		if ((error = tree_iterator_frame_push(iter, prev_entry)) < 0)
			return error;
	}

	/* we've advanced into the directory in question, let advance
	 * find the first entry
	 */
	return tree_iterator_advance(out, i);
877 878
}

879 880 881 882 883 884 885 886 887
static int tree_iterator_advance_over(
	const git_index_entry **out,
	git_iterator_status_t *status,
	git_iterator *i)
{
	*status = GIT_ITERATOR_STATUS_NORMAL;
	return git_iterator_advance(out, i);
}

888
static void tree_iterator_clear(tree_iterator *iter)
889
{
890 891
	while (iter->frames.size)
		tree_iterator_frame_pop(iter);
892

893
	git_array_clear(iter->frames);
894

895 896
	git_pool_clear(&iter->entry_pool);
	git_buf_clear(&iter->entry_path);
897

898
	iterator_clear(&iter->base);
899 900
}

901
static int tree_iterator_init(tree_iterator *iter)
902
{
903 904 905
	int error;

	git_pool_init(&iter->entry_pool, sizeof(tree_iterator_entry));
906

907 908
	if ((error = tree_iterator_frame_init(iter, iter->root, NULL)) < 0)
		return error;
909

910 911 912
	iter->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS;

	return 0;
913
}
914

915
static int tree_iterator_reset(git_iterator *i)
916
{
917
	tree_iterator *iter = (tree_iterator *)i;
918

919 920
	tree_iterator_clear(iter);
	return tree_iterator_init(iter);
921 922
}

923
static void tree_iterator_free(git_iterator *i)
924
{
925
	tree_iterator *iter = (tree_iterator *)i;
926

927
	tree_iterator_clear(iter);
928

929 930
	git_tree_free(iter->root);
	git_buf_free(&iter->entry_path);
931 932
}

933
int git_iterator_for_tree(
934
	git_iterator **out,
935
	git_tree *tree,
936
	git_iterator_options *options)
937
{
938
	tree_iterator *iter;
939
	int error;
940 941 942 943 944

	static git_iterator_callbacks callbacks = {
		tree_iterator_current,
		tree_iterator_advance,
		tree_iterator_advance_into,
945
		tree_iterator_advance_over,
946 947 948 949 950
		tree_iterator_reset,
		tree_iterator_free
	};

	*out = NULL;
951 952

	if (tree == NULL)
953
		return git_iterator_for_nothing(out, options);
954

955 956
	iter = git__calloc(1, sizeof(tree_iterator));
	GITERR_CHECK_ALLOC(iter);
957

958 959
	iter->base.type = GIT_ITERATOR_TYPE_TREE;
	iter->base.cb = &callbacks;
960

961
	if ((error = iterator_init_common(&iter->base,
962
			git_tree_owner(tree), NULL, options)) < 0 ||
963 964 965
		(error = git_tree_dup(&iter->root, tree)) < 0 ||
		(error = tree_iterator_init(iter)) < 0)
		goto on_error;
966

967 968
	*out = &iter->base;
	return 0;
969

970 971 972 973
on_error:
	git_iterator_free(&iter->base);
	return error;
}
974

975 976 977 978 979 980
int git_iterator_current_tree_entry(
	const git_tree_entry **tree_entry, git_iterator *i)
{
	tree_iterator *iter;
	tree_iterator_frame *frame;
	tree_iterator_entry *entry;
981

982 983 984 985 986 987 988 989
	assert(i->type == GIT_ITERATOR_TYPE_TREE);

	iter = (tree_iterator *)i;

	frame = tree_iterator_current_frame(iter);
	entry = tree_iterator_current_entry(frame);

	*tree_entry = entry->tree_entry;
990
	return 0;
991
}
992

993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007
int git_iterator_current_parent_tree(
	const git_tree **parent_tree, git_iterator *i, size_t depth)
{
	tree_iterator *iter;
	tree_iterator_frame *frame;

	assert(i->type == GIT_ITERATOR_TYPE_TREE);

	iter = (tree_iterator *)i;

	assert(depth < iter->frames.size);
	frame = &iter->frames.ptr[iter->frames.size-depth-1];

	*parent_tree = frame->tree;
	return 0;
1008 1009
}

1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022
/* Filesystem iterator */

typedef struct {
	struct stat st;
	size_t path_len;
	iterator_pathlist_search_t match;
	char path[GIT_FLEX_ARRAY];
} filesystem_iterator_entry;

typedef struct {
	git_vector entries;
	git_pool entry_pool;
	size_t next_idx;
1023

1024 1025 1026
	size_t path_len;
	int is_ignored;
} filesystem_iterator_frame;
1027 1028

typedef struct {
1029
	git_iterator base;
1030 1031 1032 1033 1034 1035
	char *root;
	size_t root_len;

	unsigned int dirload_flags;

	git_tree *tree;
1036
	git_index *index;
1037
	git_vector index_snapshot;
1038

1039 1040
	git_array_t(filesystem_iterator_frame) frames;
	git_ignores ignores;
1041

1042 1043 1044 1045
	/* info about the current entry */
	git_index_entry entry;
	git_buf current_path;
	int current_is_ignored;
1046

1047 1048 1049 1050 1051 1052 1053 1054 1055 1056
	/* temporary buffer for advance_over */
	git_buf tmp_buf;
} filesystem_iterator;


GIT_INLINE(filesystem_iterator_frame *) filesystem_iterator_parent_frame(
	filesystem_iterator *iter)
{
	return iter->frames.size > 1 ?
		&iter->frames.ptr[iter->frames.size-2] : NULL;
1057 1058
}

1059 1060
GIT_INLINE(filesystem_iterator_frame *) filesystem_iterator_current_frame(
	filesystem_iterator *iter)
1061
{
1062 1063
	return iter->frames.size ? &iter->frames.ptr[iter->frames.size-1] : NULL;
}
1064

1065 1066 1067 1068 1069 1070
GIT_INLINE(filesystem_iterator_entry *) filesystem_iterator_current_entry(
	filesystem_iterator_frame *frame)
{
	return frame->next_idx == 0 ?
		NULL : frame->entries.contents[frame->next_idx-1];
}
1071

1072 1073 1074 1075
static int filesystem_iterator_entry_cmp(const void *_a, const void *_b)
{
	const filesystem_iterator_entry *a = (const filesystem_iterator_entry *)_a;
	const filesystem_iterator_entry *b = (const filesystem_iterator_entry *)_b;
1076

1077 1078
	return git__strcmp(a->path, b->path);
}
1079

1080 1081 1082 1083
static int filesystem_iterator_entry_cmp_icase(const void *_a, const void *_b)
{
	const filesystem_iterator_entry *a = (const filesystem_iterator_entry *)_a;
	const filesystem_iterator_entry *b = (const filesystem_iterator_entry *)_b;
1084

1085
	return git__strcasecmp(a->path, b->path);
1086 1087
}

1088 1089 1090 1091 1092 1093 1094 1095
#define FILESYSTEM_MAX_DEPTH 100

/**
 * Figure out if an entry is a submodule.
 *
 * We consider it a submodule if the path is listed as a submodule in
 * either the tree or the index.
 */
Edward Thomson committed
1096
static int filesystem_iterator_is_submodule(
1097
	bool *out, filesystem_iterator *iter, const char *path, size_t path_len)
1098
{
1099 1100
	bool is_submodule = false;
	int error;
1101

1102
	*out = false;
1103

1104 1105 1106
	/* first see if this path is a submodule in HEAD */
	if (iter->tree) {
		git_tree_entry *entry;
1107

1108
		error = git_tree_entry_bypath(&entry, iter->tree, path);
1109

1110 1111
		if (error < 0 && error != GIT_ENOTFOUND)
			return error;
1112

1113 1114 1115 1116 1117
		if (!error) {
			is_submodule = (entry->attr == GIT_FILEMODE_COMMIT);
			git_tree_entry_free(entry);
		}
	}
1118

1119
	if (!is_submodule && iter->base.index) {
1120
		size_t pos;
1121

1122 1123
		error = git_index_snapshot_find(&pos,
			&iter->index_snapshot, iter->base.entry_srch, path, path_len, 0);
1124

1125 1126
		if (error < 0 && error != GIT_ENOTFOUND)
			return error;
1127

1128 1129 1130 1131 1132
		if (!error) {
			git_index_entry *e = git_vector_get(&iter->index_snapshot, pos);
			is_submodule = (e->mode == GIT_FILEMODE_COMMIT);
		}
	}
1133

1134
	*out = is_submodule;
1135 1136 1137
	return 0;
}

1138 1139 1140 1141
static void filesystem_iterator_frame_push_ignores(
	filesystem_iterator *iter,
	filesystem_iterator_entry *frame_entry,
	filesystem_iterator_frame *new_frame)
1142
{
1143 1144
	filesystem_iterator_frame *previous_frame;
	const char *path = frame_entry ? frame_entry->path : "";
1145

1146 1147 1148 1149 1150 1151 1152
	if (!iterator__honor_ignores(&iter->base))
		return;

	if (git_ignore__lookup(&new_frame->is_ignored,
			&iter->ignores, path, GIT_DIR_FLAG_TRUE) < 0) {
		giterr_clear();
		new_frame->is_ignored = GIT_IGNORE_NOTFOUND;
1153 1154
	}

1155 1156 1157
	/* if this is not the top level directory... */
	if (frame_entry) {
		const char *relative_path;
1158

1159
		previous_frame = filesystem_iterator_parent_frame(iter);
1160

1161 1162 1163 1164 1165 1166 1167 1168 1169
		/* push new ignores for files in this directory */
		relative_path = frame_entry->path + previous_frame->path_len;

		/* inherit ignored from parent if no rule specified */
		if (new_frame->is_ignored <= GIT_IGNORE_NOTFOUND)
			new_frame->is_ignored = previous_frame->is_ignored;

		git_ignore__push_dir(&iter->ignores, relative_path);
	}
1170 1171
}

1172 1173
static void filesystem_iterator_frame_pop_ignores(
	filesystem_iterator *iter)
1174
{
1175 1176
	if (iterator__honor_ignores(&iter->base))
		git_ignore__pop_dir(&iter->ignores);
1177 1178
}

1179 1180 1181 1182 1183 1184 1185
GIT_INLINE(bool) filesystem_iterator_examine_path(
	bool *is_dir_out,
	iterator_pathlist_search_t *match_out,
	filesystem_iterator *iter,
	filesystem_iterator_entry *frame_entry,
	const char *path,
	size_t path_len)
1186
{
1187 1188
	bool is_dir = 0;
	iterator_pathlist_search_t match = ITERATOR_PATHLIST_FULL;
1189

1190
	*is_dir_out = false;
Edward Thomson committed
1191
	*match_out = ITERATOR_PATHLIST_NONE;
1192

1193 1194
	if (iter->base.start_len) {
		int cmp = iter->base.strncomp(path, iter->base.start, path_len);
1195

1196 1197 1198 1199 1200 1201 1202
		/* we haven't stat'ed `path` yet, so we don't yet know if it's a
		 * directory or not.  special case if the current path may be a
		 * directory that matches the start prefix.
		 */
		if (cmp == 0) {
			if (iter->base.start[path_len] == '/')
				is_dir = true;
1203

1204 1205
			else if (iter->base.start[path_len] != '\0')
				cmp = -1;
1206 1207
		}

1208 1209
		if (cmp < 0)
			return false;
1210
	}
1211

1212 1213
	if (iter->base.end_len) {
		int cmp = iter->base.strncomp(path, iter->base.end, iter->base.end_len);
1214

1215 1216
		if (cmp > 0)
			return false;
1217
	}
1218

1219 1220
	/* if we have a pathlist that we're limiting to, examine this path now
	 * to avoid a `stat` if we're not interested in the path.
1221
	 */
1222 1223 1224 1225 1226 1227
	if (iter->base.pathlist.length) {
		/* if our parent was explicitly included, so too are we */
		if (frame_entry && frame_entry->match != ITERATOR_PATHLIST_IS_PARENT)
			match = ITERATOR_PATHLIST_FULL;
		else
			match = iterator_pathlist_search(&iter->base, path, path_len);
1228

Edward Thomson committed
1229
		if (match == ITERATOR_PATHLIST_NONE)
1230
			return false;
1231

1232 1233 1234 1235
		/* Ensure that the pathlist entry lines up with what we expected */
		if (match == ITERATOR_PATHLIST_IS_DIR ||
			match == ITERATOR_PATHLIST_IS_PARENT)
			is_dir = true;
1236 1237
	}

1238 1239 1240
	*is_dir_out = is_dir;
	*match_out = match;
	return true;
1241 1242
}

1243 1244
GIT_INLINE(bool) filesystem_iterator_is_dot_git(
	filesystem_iterator *iter, const char *path, size_t path_len)
1245
{
1246
	size_t len;
1247

1248 1249
	if (!iterator__ignore_dot_git(&iter->base))
		return false;
1250

1251 1252
	if ((len = path_len) < 4)
		return false;
1253

1254 1255
	if (path[len - 1] == '/')
		len--;
1256

1257 1258 1259 1260 1261
	if (git__tolower(path[len - 1]) != 't' ||
		git__tolower(path[len - 2]) != 'i' ||
		git__tolower(path[len - 3]) != 'g' ||
		git__tolower(path[len - 4]) != '.')
		return false;
1262

1263
	return (len == 4 || path[len - 5] == '/');
1264 1265
}

1266 1267 1268 1269 1270 1271
static filesystem_iterator_entry *filesystem_iterator_entry_init(
	filesystem_iterator_frame *frame,
	const char *path,
	size_t path_len,
	struct stat *statbuf,
	iterator_pathlist_search_t pathlist_match)
1272
{
1273 1274
	filesystem_iterator_entry *entry;
	size_t entry_size;
1275

1276 1277 1278 1279 1280 1281 1282 1283
	/* Make sure to append two bytes, one for the path's null
	 * termination, one for a possible trailing '/' for folders.
	 */
	if (GIT_ADD_SIZET_OVERFLOW(&entry_size,
			sizeof(filesystem_iterator_entry), path_len) ||
		GIT_ADD_SIZET_OVERFLOW(&entry_size, entry_size, 2) ||
		(entry = git_pool_malloc(&frame->entry_pool, entry_size)) == NULL)
		return NULL;
1284

1285 1286 1287 1288
	entry->path_len = path_len;
	entry->match = pathlist_match;
	memcpy(entry->path, path, path_len);
	memcpy(&entry->st, statbuf, sizeof(struct stat));
1289

1290 1291 1292
	/* Suffix directory paths with a '/' */
	if (S_ISDIR(entry->st.st_mode))
		entry->path[entry->path_len++] = '/';
1293

1294
	entry->path[entry->path_len] = '\0';
1295

1296
	return entry;
1297
}
1298

1299 1300 1301
static int filesystem_iterator_frame_push(
	filesystem_iterator *iter,
	filesystem_iterator_entry *frame_entry)
1302
{
1303 1304 1305 1306 1307 1308 1309 1310
	filesystem_iterator_frame *new_frame = NULL;
	git_path_diriter diriter = GIT_PATH_DIRITER_INIT;
	git_buf root = GIT_BUF_INIT;
	const char *path;
	filesystem_iterator_entry *entry;
	struct stat statbuf;
	size_t path_len;
	int error;
1311

1312 1313
	if (iter->frames.size == FILESYSTEM_MAX_DEPTH) {
		giterr_set(GITERR_REPOSITORY,
1314
			"directory nesting too deep (%"PRIuZ")", iter->frames.size);
1315
		return -1;
1316
	}
1317

1318 1319
	new_frame = git_array_alloc(iter->frames);
	GITERR_CHECK_ALLOC(new_frame);
1320

1321
	memset(new_frame, 0, sizeof(filesystem_iterator_frame));
1322

1323 1324
	if (frame_entry)
		git_buf_joinpath(&root, iter->root, frame_entry->path);
1325
	else
1326
		git_buf_puts(&root, iter->root);
1327

1328 1329 1330 1331 1332 1333
	if (git_buf_oom(&root)) {
		error = -1;
		goto done;
	}

	new_frame->path_len = frame_entry ? frame_entry->path_len : 0;
1334

1335
	/* Any error here is equivalent to the dir not existing, skip over it */
1336
	if ((error = git_path_diriter_init(
1337
			&diriter, root.ptr, iter->dirload_flags)) < 0) {
1338
		error = GIT_ENOTFOUND;
1339
		goto done;
1340
	}
1341

1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352
	if ((error = git_vector_init(&new_frame->entries, 64,
			iterator__ignore_case(&iter->base) ?
			filesystem_iterator_entry_cmp_icase :
			filesystem_iterator_entry_cmp)) < 0)
		goto done;

	git_pool_init(&new_frame->entry_pool, 1);

	/* check if this directory is ignored */
	filesystem_iterator_frame_push_ignores(iter, frame_entry, new_frame);

1353
	while ((error = git_path_diriter_next(&diriter)) == 0) {
1354 1355 1356
		iterator_pathlist_search_t pathlist_match = ITERATOR_PATHLIST_FULL;
		bool dir_expected = false;

1357 1358 1359
		if ((error = git_path_diriter_fullpath(&path, &path_len, &diriter)) < 0)
			goto done;

1360
		assert(path_len > iter->root_len);
1361 1362

		/* remove the prefix if requested */
1363 1364
		path += iter->root_len;
		path_len -= iter->root_len;
1365

1366 1367 1368 1369
		/* examine start / end and the pathlist to see if this path is in it.
		 * note that since we haven't yet stat'ed the path, we cannot know
		 * whether it's a directory yet or not, so this can give us an
		 * expected type (S_IFDIR or S_IFREG) that we should examine)
1370
		 */
1371 1372
		if (!filesystem_iterator_examine_path(&dir_expected, &pathlist_match,
			iter, frame_entry, path, path_len))
1373 1374
			continue;

1375 1376
		/* TODO: don't need to stat if assume unchanged for this path and
		 * we have an index, we can just copy the data out of it.
1377 1378
		 */

1379 1380 1381 1382
		if ((error = git_path_diriter_stat(&statbuf, &diriter)) < 0) {
			/* file was removed between readdir and lstat */
			if (error == GIT_ENOTFOUND)
				continue;
1383

1384 1385 1386
			/* treat the file as unreadable */
			memset(&statbuf, 0, sizeof(statbuf));
			statbuf.st_mode = GIT_FILEMODE_UNREADABLE;
1387

1388 1389
			error = 0;
		}
1390

1391
		iter->base.stat_calls++;
1392

1393 1394 1395 1396 1397 1398
		/* Ignore wacky things in the filesystem */
		if (!S_ISDIR(statbuf.st_mode) &&
			!S_ISREG(statbuf.st_mode) &&
			!S_ISLNK(statbuf.st_mode) &&
			statbuf.st_mode != GIT_FILEMODE_UNREADABLE)
			continue;
1399

1400
		if (filesystem_iterator_is_dot_git(iter, path, path_len))
1401
			continue;
1402 1403 1404 1405 1406

		/* convert submodules to GITLINK and remove trailing slashes */
		if (S_ISDIR(statbuf.st_mode)) {
			bool submodule = false;

Edward Thomson committed
1407 1408
			if ((error = filesystem_iterator_is_submodule(&submodule,
					iter, path, path_len)) < 0)
1409 1410 1411 1412
				goto done;

			if (submodule)
				statbuf.st_mode = GIT_FILEMODE_COMMIT;
1413 1414
		}

1415
		/* Ensure that the pathlist entry lines up with what we expected */
1416
		else if (dir_expected)
1417 1418 1419 1420 1421 1422 1423
			continue;

		entry = filesystem_iterator_entry_init(new_frame,
			path, path_len, &statbuf, pathlist_match);
		GITERR_CHECK_ALLOC(entry);

		git_vector_insert(&new_frame->entries, entry);
1424 1425 1426 1427 1428 1429
	}

	if (error == GIT_ITEROVER)
		error = 0;

	/* sort now that directory suffix is added */
1430
	git_vector_sort(&new_frame->entries);
1431 1432

done:
1433 1434 1435 1436
	if (error < 0)
		git_array_pop(iter->frames);

	git_buf_free(&root);
1437 1438 1439 1440
	git_path_diriter_free(&diriter);
	return error;
}

1441
GIT_INLINE(void) filesystem_iterator_frame_pop(filesystem_iterator *iter)
1442
{
1443
	filesystem_iterator_frame *frame;
1444

1445
	assert(iter->frames.size);
1446

1447 1448
	frame = git_array_pop(iter->frames);
	filesystem_iterator_frame_pop_ignores(iter);
1449

1450 1451 1452
	git_pool_clear(&frame->entry_pool);
	git_vector_free(&frame->entries);
}
1453

1454 1455 1456 1457 1458 1459
static void filesystem_iterator_set_current(
	filesystem_iterator *iter,
	filesystem_iterator_entry *entry)
{
	iter->entry.ctime.seconds = entry->st.st_ctime;
	iter->entry.ctime.nanoseconds = entry->st.st_ctime_nsec;
1460

1461 1462
	iter->entry.mtime.seconds = entry->st.st_mtime;
	iter->entry.mtime.nanoseconds = entry->st.st_mtime_nsec;
1463

1464 1465 1466 1467 1468 1469
	iter->entry.dev = entry->st.st_dev;
	iter->entry.ino = entry->st.st_ino;
	iter->entry.mode = git_futils_canonical_mode(entry->st.st_mode);
	iter->entry.uid = entry->st.st_uid;
	iter->entry.gid = entry->st.st_gid;
	iter->entry.file_size = entry->st.st_size;
1470

1471
	iter->entry.path = entry->path;
1472

1473
	iter->current_is_ignored = GIT_IGNORE_UNCHECKED;
1474 1475
}

1476 1477
static int filesystem_iterator_current(
	const git_index_entry **out, git_iterator *i)
1478
{
1479
	filesystem_iterator *iter = (filesystem_iterator *)i;
1480

1481 1482
	if (!iterator__has_been_accessed(i))
		return iter->base.cb->advance(out, i);
1483

1484 1485 1486 1487
	if (!iter->frames.size) {
		*out = NULL;
		return GIT_ITEROVER;
	}
1488

1489 1490
	*out = &iter->entry;
	return 0;
1491 1492
}

1493 1494
static int filesystem_iterator_advance(
	const git_index_entry **out, git_iterator *i)
1495
{
1496
	filesystem_iterator *iter = (filesystem_iterator *)i;
1497 1498
	int error = 0;

1499
	iter->base.flags |= GIT_ITERATOR_FIRST_ACCESS;
1500

1501 1502 1503 1504
	/* examine filesystem entries until we find the next one to return */
	while (true) {
		filesystem_iterator_frame *frame;
		filesystem_iterator_entry *entry;
1505

1506 1507 1508 1509
		if ((frame = filesystem_iterator_current_frame(iter)) == NULL) {
			error = GIT_ITEROVER;
			break;
		}
1510

1511 1512 1513 1514 1515
		/* no more entries in this frame.  pop the frame out */
		if (frame->next_idx == frame->entries.length) {
			filesystem_iterator_frame_pop(iter);
			continue;
		}
1516

1517 1518 1519
		/* we have more entries in the current frame, that's our next entry */
		entry = frame->entries.contents[frame->next_idx];
		frame->next_idx++;
1520

1521 1522 1523
		if (S_ISDIR(entry->st.st_mode)) {
			if (iterator__do_autoexpand(iter)) {
				error = filesystem_iterator_frame_push(iter, entry);
1524

1525 1526 1527 1528 1529 1530 1531 1532
				/* may get GIT_ENOTFOUND due to races or permission problems
				 * that we want to quietly swallow
				 */
				if (error == GIT_ENOTFOUND)
					continue;
				else if (error < 0)
					break;
			}
1533

1534 1535 1536
			if (!iterator__include_trees(iter))
				continue;
		}
1537

1538 1539
		filesystem_iterator_set_current(iter, entry);
		break;
1540
	}
1541 1542 1543 1544 1545

	if (out)
		*out = (error == 0) ? &iter->entry : NULL;

	return error;
1546
}
1547

1548 1549
static int filesystem_iterator_advance_into(
	const git_index_entry **out, git_iterator *i)
1550
{
1551 1552 1553
	filesystem_iterator *iter = (filesystem_iterator *)i;
	filesystem_iterator_frame *frame;
	filesystem_iterator_entry *prev_entry;
1554 1555
	int error;

1556 1557
	if (out)
		*out = NULL;
1558

1559 1560
	if ((frame = filesystem_iterator_current_frame(iter)) == NULL)
		return GIT_ITEROVER;
1561

1562 1563
	/* get the last seen entry */
	prev_entry = filesystem_iterator_current_entry(frame);
1564

1565 1566 1567 1568 1569
	/* it's legal to call advance_into when auto-expand is on.  in this case,
	 * we will have pushed a new (empty) frame on to the stack for this
	 * new directory.  since it's empty, its current_entry should be null.
	 */
	assert(iterator__do_autoexpand(i) ^ (prev_entry != NULL));
1570

1571 1572 1573 1574
	if (prev_entry) {
		if (prev_entry->st.st_mode != GIT_FILEMODE_COMMIT &&
			!S_ISDIR(prev_entry->st.st_mode))
			return 0;
1575

1576
		if ((error = filesystem_iterator_frame_push(iter, prev_entry)) < 0)
1577 1578 1579
			return error;
	}

1580 1581 1582 1583
	/* we've advanced into the directory in question, let advance
	 * find the first entry
	 */
	return filesystem_iterator_advance(out, i);
1584 1585
}

1586
int git_iterator_current_workdir_path(git_buf **out, git_iterator *i)
1587
{
1588 1589
	filesystem_iterator *iter = (filesystem_iterator *)i;
	const git_index_entry *entry;
1590

1591 1592 1593 1594 1595
	if (i->type != GIT_ITERATOR_TYPE_FS &&
		i->type != GIT_ITERATOR_TYPE_WORKDIR) {
		*out = NULL;
		return 0;
	}
1596

1597
	git_buf_truncate(&iter->current_path, iter->root_len);
1598

1599 1600 1601
	if (git_iterator_current(&entry, i) < 0 ||
		git_buf_puts(&iter->current_path, entry->path) < 0)
		return -1;
1602

1603 1604 1605
	*out = &iter->current_path;
	return 0;
}
1606

1607 1608 1609 1610 1611 1612 1613 1614 1615 1616
GIT_INLINE(git_dir_flag) entry_dir_flag(git_index_entry *entry)
{
#if defined(GIT_WIN32) && !defined(__MINGW32__)
	return (entry && entry->mode) ?
		(S_ISDIR(entry->mode) ? GIT_DIR_FLAG_TRUE : GIT_DIR_FLAG_FALSE) :
		GIT_DIR_FLAG_UNKNOWN;
#else
	GIT_UNUSED(entry);
	return GIT_DIR_FLAG_UNKNOWN;
#endif
1617 1618
}

1619
static void filesystem_iterator_update_ignored(filesystem_iterator *iter)
1620
{
1621 1622
	filesystem_iterator_frame *frame;
	git_dir_flag dir_flag = entry_dir_flag(&iter->entry);
1623

1624 1625 1626 1627 1628
	if (git_ignore__lookup(&iter->current_is_ignored,
			&iter->ignores, iter->entry.path, dir_flag) < 0) {
		giterr_clear();
		iter->current_is_ignored = GIT_IGNORE_NOTFOUND;
	}
1629

1630 1631 1632 1633 1634
	/* use ignore from containing frame stack */
	if (iter->current_is_ignored <= GIT_IGNORE_NOTFOUND) {
		frame = filesystem_iterator_current_frame(iter);
		iter->current_is_ignored = frame->is_ignored;
	}
1635 1636
}

1637 1638
GIT_INLINE(bool) filesystem_iterator_current_is_ignored(
	filesystem_iterator *iter)
1639
{
1640 1641
	if (iter->current_is_ignored == GIT_IGNORE_UNCHECKED)
		filesystem_iterator_update_ignored(iter);
1642

1643
	return (iter->current_is_ignored == GIT_IGNORE_TRUE);
1644 1645
}

1646
bool git_iterator_current_is_ignored(git_iterator *i)
1647
{
1648 1649
	if (i->type != GIT_ITERATOR_TYPE_WORKDIR)
		return false;
1650

1651 1652
	return filesystem_iterator_current_is_ignored((filesystem_iterator *)i);
}
1653

1654 1655 1656 1657
bool git_iterator_current_tree_is_ignored(git_iterator *i)
{
	filesystem_iterator *iter = (filesystem_iterator *)i;
	filesystem_iterator_frame *frame;
1658

1659 1660
	if (i->type != GIT_ITERATOR_TYPE_WORKDIR)
		return false;
1661

1662 1663 1664
	frame = filesystem_iterator_current_frame(iter);
	return (frame->is_ignored == GIT_IGNORE_TRUE);
}
1665

1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676
static int filesystem_iterator_advance_over(
	const git_index_entry **out,
	git_iterator_status_t *status,
	git_iterator *i)
{
	filesystem_iterator *iter = (filesystem_iterator *)i;
	filesystem_iterator_frame *current_frame;
	filesystem_iterator_entry *current_entry;
	const git_index_entry *entry = NULL;
	const char *base;
	int error = 0;
1677

1678 1679
	*out = NULL;
	*status = GIT_ITERATOR_STATUS_NORMAL;
1680

1681
	assert(iterator__has_been_accessed(i));
1682

1683 1684 1685 1686
	current_frame = filesystem_iterator_current_frame(iter);
	assert(current_frame);
	current_entry = filesystem_iterator_current_entry(current_frame);
	assert(current_entry);
1687

1688 1689
	if ((error = git_iterator_current(&entry, i)) < 0)
		return error;
1690

1691 1692 1693
	if (!S_ISDIR(entry->mode)) {
		if (filesystem_iterator_current_is_ignored(iter))
			*status = GIT_ITERATOR_STATUS_IGNORED;
1694

1695
		return filesystem_iterator_advance(out, i);
1696
	}
1697

1698 1699 1700
	git_buf_clear(&iter->tmp_buf);
	if ((error = git_buf_puts(&iter->tmp_buf, entry->path)) < 0)
		return error;
1701

1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715
	base = iter->tmp_buf.ptr;

	/* scan inside the directory looking for files.  if we find nothing,
	 * we will remain EMPTY.  if we find any ignored item, upgrade EMPTY to
	 * IGNORED.  if we find a real actual item, upgrade all the way to NORMAL
	 * and then stop.
	 *
	 * however, if we're here looking for a pathlist item (but are not
	 * actually in the pathlist ourselves) then start at FILTERED instead of
	 * EMPTY.  callers then know that this path was not something they asked
	 * about.
	 */
	*status = current_entry->match == ITERATOR_PATHLIST_IS_PARENT ?
		GIT_ITERATOR_STATUS_FILTERED : GIT_ITERATOR_STATUS_EMPTY;
1716

1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727
	while (entry && !iter->base.prefixcomp(entry->path, base)) {
		if (filesystem_iterator_current_is_ignored(iter)) {
			/* if we found an explicitly ignored item, then update from
			 * EMPTY to IGNORED
			 */
			*status = GIT_ITERATOR_STATUS_IGNORED;
		} else if (S_ISDIR(entry->mode)) {
			error = filesystem_iterator_advance_into(&entry, i);

			if (!error)
				continue;
1728

1729 1730 1731
			/* this directory disappeared, ignore it */
			else if (error == GIT_ENOTFOUND)
				error = 0;
1732

1733 1734 1735
			/* a real error occurred */
			else
				break;
1736
		} else {
1737 1738 1739
			/* we found a non-ignored item, treat parent as untracked */
			*status = GIT_ITERATOR_STATUS_NORMAL;
			break;
1740
		}
1741 1742 1743 1744 1745 1746 1747 1748 1749

		if ((error = git_iterator_advance(&entry, i)) < 0)
			break;
	}

	/* wrap up scan back to base directory */
	while (entry && !iter->base.prefixcomp(entry->path, base)) {
		if ((error = git_iterator_advance(&entry, i)) < 0)
			break;
1750 1751
	}

1752 1753 1754
	if (!error)
		*out = entry;

1755 1756 1757
	return error;
}

1758
static void filesystem_iterator_clear(filesystem_iterator *iter)
1759
{
1760 1761
	while (iter->frames.size)
		filesystem_iterator_frame_pop(iter);
1762

1763 1764
	git_array_clear(iter->frames);
	git_ignore__free(&iter->ignores);
1765

1766
	git_buf_free(&iter->tmp_buf);
1767

1768
	iterator_clear(&iter->base);
1769
}
1770

1771
static int filesystem_iterator_init(filesystem_iterator *iter)
1772
{
1773
	int error;
1774

1775 1776 1777 1778
	if (iterator__honor_ignores(&iter->base) &&
		(error = git_ignore__for_path(iter->base.repo,
			".gitignore", &iter->ignores)) < 0)
		return error;
1779

1780 1781
	if ((error = filesystem_iterator_frame_push(iter, NULL)) < 0)
		return error;
1782

1783
	iter->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS;
1784

1785
	return 0;
1786 1787
}

1788
static int filesystem_iterator_reset(git_iterator *i)
1789
{
1790
	filesystem_iterator *iter = (filesystem_iterator *)i;
1791

1792 1793 1794
	filesystem_iterator_clear(iter);
	return filesystem_iterator_init(iter);
}
1795

1796 1797 1798
static void filesystem_iterator_free(git_iterator *i)
{
	filesystem_iterator *iter = (filesystem_iterator *)i;
1799 1800
	git__free(iter->root);
	git_buf_free(&iter->current_path);
1801
	git_tree_free(iter->tree);
1802 1803
	if (iter->index)
		git_index_snapshot_release(&iter->index_snapshot, iter->index);
1804
	filesystem_iterator_clear(iter);
1805 1806
}

1807 1808 1809 1810 1811 1812 1813 1814
static int iterator_for_filesystem(
	git_iterator **out,
	git_repository *repo,
	const char *root,
	git_index *index,
	git_tree *tree,
	git_iterator_type_t type,
	git_iterator_options *options)
1815
{
1816 1817 1818
	filesystem_iterator *iter;
	size_t root_len;
	int error;
1819

1820 1821 1822 1823 1824 1825 1826 1827
	static git_iterator_callbacks callbacks = {
		filesystem_iterator_current,
		filesystem_iterator_advance,
		filesystem_iterator_advance_into,
		filesystem_iterator_advance_over,
		filesystem_iterator_reset,
		filesystem_iterator_free
	};
1828

1829
	*out = NULL;
1830

1831 1832
	if (root == NULL)
		return git_iterator_for_nothing(out, options);
1833

1834 1835
	iter = git__calloc(1, sizeof(filesystem_iterator));
	GITERR_CHECK_ALLOC(iter);
1836

1837 1838 1839
	iter->base.type = type;
	iter->base.cb = &callbacks;

1840
	root_len = strlen(root);
1841

1842 1843
	iter->root = git__malloc(root_len+2);
	GITERR_CHECK_ALLOC(iter->root);
1844

1845
	memcpy(iter->root, root, root_len);
1846

1847 1848 1849
	if (root_len == 0 || root[root_len-1] != '/') {
		iter->root[root_len] = '/';
		root_len++;
1850
	}
1851 1852
	iter->root[root_len] = '\0';
	iter->root_len = root_len;
1853

1854 1855
	if ((error = git_buf_puts(&iter->current_path, iter->root)) < 0)
		goto on_error;
1856

1857
	if ((error = iterator_init_common(&iter->base, repo, index, options)) < 0)
1858 1859 1860 1861 1862
		goto on_error;

	if (tree && (error = git_tree_dup(&iter->tree, tree)) < 0)
		goto on_error;

1863
	if (index &&
1864 1865 1866
		(error = git_index_snapshot_new(&iter->index_snapshot, index)) < 0)
		goto on_error;

1867
	iter->index = index;
1868 1869 1870 1871
	iter->dirload_flags =
		(iterator__ignore_case(&iter->base) ? GIT_PATH_DIR_IGNORE_CASE : 0) |
		(iterator__flag(&iter->base, PRECOMPOSE_UNICODE) ?
			 GIT_PATH_DIR_PRECOMPOSE_UNICODE : 0);
1872

1873 1874
	if ((error = filesystem_iterator_init(iter)) < 0)
		goto on_error;
1875

1876
	*out = &iter->base;
1877
	return 0;
1878 1879 1880 1881

on_error:
	git_iterator_free(&iter->base);
	return error;
1882 1883
}

1884 1885 1886 1887
int git_iterator_for_filesystem(
	git_iterator **out,
	const char *root,
	git_iterator_options *options)
1888
{
1889 1890
	return iterator_for_filesystem(out,
		NULL, root, NULL, NULL, GIT_ITERATOR_TYPE_FS, options);
1891 1892
}

1893
int git_iterator_for_workdir_ext(
1894
	git_iterator **out,
1895
	git_repository *repo,
1896
	const char *repo_workdir,
1897 1898
	git_index *index,
	git_tree *tree,
1899
	git_iterator_options *given_opts)
1900
{
1901
	git_iterator_options options = GIT_ITERATOR_OPTIONS_INIT;
1902

1903 1904 1905
	if (!repo_workdir) {
		if (git_repository__ensure_not_bare(repo, "scan working directory") < 0)
			return GIT_EBAREREPO;
1906

1907
		repo_workdir = git_repository_workdir(repo);
1908 1909
	}

1910 1911 1912
	/* upgrade to a workdir iterator, adding necessary internal flags */
	if (given_opts)
		memcpy(&options, given_opts, sizeof(git_iterator_options));
1913

1914 1915
	options.flags |= GIT_ITERATOR_HONOR_IGNORES |
		GIT_ITERATOR_IGNORE_DOT_GIT;
1916

1917 1918
	return iterator_for_filesystem(out,
		repo, repo_workdir, index, tree, GIT_ITERATOR_TYPE_WORKDIR, &options);
1919 1920
}

1921

1922
/* Index iterator */
1923

1924

1925 1926 1927
typedef struct {
	git_iterator base;
	git_vector entries;
1928 1929 1930
	size_t next_idx;

	/* the pseudotree entry */
1931
	git_index_entry tree_entry;
1932 1933 1934 1935
	git_buf tree_buf;
	bool skip_tree;

	const git_index_entry *entry;
1936
} index_iterator;
1937

1938 1939
static int index_iterator_current(
	const git_index_entry **out, git_iterator *i)
1940
{
1941
	index_iterator *iter = (index_iterator *)i;
1942

1943 1944 1945 1946 1947 1948
	if (!iterator__has_been_accessed(i))
		return iter->base.cb->advance(out, i);

	if (iter->entry == NULL) {
		*out = NULL;
		return GIT_ITEROVER;
1949 1950
	}

1951 1952
	*out = iter->entry;
	return 0;
1953 1954
}

1955 1956 1957 1958
static bool index_iterator_create_pseudotree(
	const git_index_entry **out,
	index_iterator *iter,
	const char *path)
1959
{
1960 1961
	const char *prev_path, *relative_path, *dirsep;
	size_t common_len;
1962

1963
	prev_path = iter->entry ? iter->entry->path : "";
1964

1965 1966 1967
	/* determine if the new path is in a different directory from the old */
	common_len = git_path_common_dirlen(prev_path, path);
	relative_path = path + common_len;
1968

1969 1970
	if ((dirsep = strchr(relative_path, '/')) == NULL)
		return false;
1971

1972 1973
	git_buf_clear(&iter->tree_buf);
	git_buf_put(&iter->tree_buf, path, (dirsep - path) + 1);
1974

1975 1976
	iter->tree_entry.mode = GIT_FILEMODE_TREE;
	iter->tree_entry.path = iter->tree_buf.ptr;
1977

1978 1979
	*out = &iter->tree_entry;
	return true;
1980 1981
}

1982
static int index_iterator_skip_pseudotree(index_iterator *iter)
1983
{
1984 1985
	assert(iterator__has_been_accessed(&iter->base));
	assert(S_ISDIR(iter->entry->mode));
1986

1987 1988
	while (true) {
		const git_index_entry *next_entry = NULL;
1989

1990 1991
		if (++iter->next_idx >= iter->entries.length)
			return GIT_ITEROVER;
1992

1993
		next_entry = iter->entries.contents[iter->next_idx];
1994

1995 1996 1997 1998
		if (iter->base.strncomp(iter->tree_buf.ptr, next_entry->path,
			iter->tree_buf.size) != 0)
			break;
	}
1999

2000
	iter->skip_tree = false;
2001
	return 0;
2002 2003
}

2004 2005
static int index_iterator_advance(
	const git_index_entry **out, git_iterator *i)
2006
{
2007 2008
	index_iterator *iter = (index_iterator *)i;
	const git_index_entry *entry = NULL;
2009
	bool is_submodule;
2010
	int error = 0;
2011

2012
	iter->base.flags |= GIT_ITERATOR_FIRST_ACCESS;
2013

2014 2015 2016 2017 2018
	while (true) {
		if (iter->next_idx >= iter->entries.length) {
			error = GIT_ITEROVER;
			break;
		}
2019

2020 2021 2022 2023 2024
		/* we were not asked to expand this pseudotree.  advance over it. */
		if (iter->skip_tree) {
			index_iterator_skip_pseudotree(iter);
			continue;
		}
2025

2026
		entry = iter->entries.contents[iter->next_idx];
2027
		is_submodule = S_ISGITLINK(entry->mode);
2028

2029
		if (!iterator_has_started(&iter->base, entry->path, is_submodule)) {
2030 2031 2032
			iter->next_idx++;
			continue;
		}
2033

2034
		if (iterator_has_ended(&iter->base, entry->path)) {
2035 2036 2037
			error = GIT_ITEROVER;
			break;
		}
2038

2039 2040 2041 2042 2043
		/* if we have a list of paths we're interested in, examine it */
		if (!iterator_pathlist_next_is(&iter->base, entry->path)) {
			iter->next_idx++;
			continue;
		}
2044

2045 2046 2047 2048 2049 2050
		/* if this is a conflict, skip it unless we're including conflicts */
		if (git_index_entry_is_conflict(entry) &&
			!iterator__include_conflicts(&iter->base)) {
			iter->next_idx++;
			continue;
		}
2051

2052 2053 2054 2055 2056 2057 2058
		/* we've found what will be our next _file_ entry.  but if we are
		 * returning trees entries, we may need to return a pseudotree
		 * entry that will contain this.  don't advance over this entry,
		 * though, we still need to return it on the next `advance`.
		 */
		if (iterator__include_trees(&iter->base) &&
			index_iterator_create_pseudotree(&entry, iter, entry->path)) {
2059

2060 2061 2062
			/* Note whether this pseudo tree should be expanded or not */
			iter->skip_tree = iterator__dont_autoexpand(&iter->base);
			break;
2063 2064
		}

2065 2066
		iter->next_idx++;
		break;
2067 2068
	}

2069 2070 2071 2072 2073 2074
	iter->entry = (error == 0) ? entry : NULL;

	if (out)
		*out = iter->entry;

	return error;
2075 2076
}

2077 2078
static int index_iterator_advance_into(
	const git_index_entry **out, git_iterator *i)
2079
{
2080
	index_iterator *iter = (index_iterator *)i;
2081

2082
	if (! S_ISDIR(iter->tree_entry.mode)) {
Edward Thomson committed
2083 2084 2085
		if (out)
			*out = NULL;

2086
		return 0;
2087
	}
2088

2089 2090
	iter->skip_tree = false;
	return index_iterator_advance(out, i);
2091
}
2092

2093 2094 2095 2096
static int index_iterator_advance_over(
	const git_index_entry **out,
	git_iterator_status_t *status,
	git_iterator *i)
2097
{
2098 2099 2100
	index_iterator *iter = (index_iterator *)i;
	const git_index_entry *entry;
	int error;
2101

2102 2103
	if ((error = index_iterator_current(&entry, i)) < 0)
		return error;
2104

2105 2106
	if (S_ISDIR(entry->mode))
		index_iterator_skip_pseudotree(iter);
2107

2108 2109 2110
	*status = GIT_ITERATOR_STATUS_NORMAL;
	return index_iterator_advance(out, i);
}
2111

2112 2113 2114 2115
static void index_iterator_clear(index_iterator *iter)
{
	iterator_clear(&iter->base);
}
2116

2117 2118 2119 2120 2121 2122 2123
static int index_iterator_init(index_iterator *iter)
{
	iter->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS;
	iter->next_idx = 0;
	iter->skip_tree = false;
	return 0;
}
2124

2125 2126 2127
static int index_iterator_reset(git_iterator *i)
{
	index_iterator *iter = (index_iterator *)i;
2128

2129 2130 2131
	index_iterator_clear(iter);
	return index_iterator_init(iter);
}
2132

2133
static void index_iterator_free(git_iterator *i)
2134
{
2135 2136 2137
	index_iterator *iter = (index_iterator *)i;

	git_index_snapshot_release(&iter->entries, iter->base.index);
2138
	git_buf_free(&iter->tree_buf);
2139 2140 2141
}

int git_iterator_for_index(
2142
	git_iterator **out,
2143 2144 2145 2146
	git_repository *repo,
	git_index  *index,
	git_iterator_options *options)
{
2147 2148
	index_iterator *iter;
	int error;
2149

2150 2151 2152 2153 2154 2155 2156 2157
	static git_iterator_callbacks callbacks = {
		index_iterator_current,
		index_iterator_advance,
		index_iterator_advance_into,
		index_iterator_advance_over,
		index_iterator_reset,
		index_iterator_free
	};
2158

2159
	*out = NULL;
2160

2161 2162
	if (index == NULL)
		return git_iterator_for_nothing(out, options);
2163

2164 2165
	iter = git__calloc(1, sizeof(index_iterator));
	GITERR_CHECK_ALLOC(iter);
2166

2167 2168
	iter->base.type = GIT_ITERATOR_TYPE_INDEX;
	iter->base.cb = &callbacks;
2169

2170 2171 2172 2173
	if ((error = iterator_init_common(&iter->base, repo, index, options)) < 0 ||
		(error = git_index_snapshot_new(&iter->entries, index)) < 0 ||
		(error = index_iterator_init(iter)) < 0)
		goto on_error;
2174

2175 2176 2177
	git_vector_set_cmp(&iter->entries, iterator__ignore_case(&iter->base) ?
		git_index_entry_icmp : git_index_entry_cmp);
	git_vector_sort(&iter->entries);
2178

2179
	*out = &iter->base;
2180
	return 0;
2181 2182 2183 2184

on_error:
	git_iterator_free(&iter->base);
	return error;
2185
}
2186

2187

2188 2189
/* Iterator API */

Edward Thomson committed
2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203
int git_iterator_reset_range(
	git_iterator *i, const char *start, const char *end)
{
	if (iterator_reset_range(i, start, end) < 0)
		return -1;

	return i->cb->reset(i);
}

void git_iterator_set_ignore_case(git_iterator *i, bool ignore_case)
{
	assert(!iterator__has_been_accessed(i));
	iterator_set_ignore_case(i, ignore_case);
}
2204

2205 2206 2207 2208
void git_iterator_free(git_iterator *iter)
{
	if (iter == NULL)
		return;
2209

2210
	iter->cb->free(iter);
2211

2212 2213 2214
	git_vector_free(&iter->pathlist);
	git__free(iter->start);
	git__free(iter->end);
2215

2216
	memset(iter, 0, sizeof(*iter));
2217

2218 2219 2220
	git__free(iter);
}

2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298
int git_iterator_walk(
	git_iterator **iterators,
	size_t cnt,
	git_iterator_walk_cb cb,
	void *data)
{
	const git_index_entry **iterator_item;	/* next in each iterator */
	const git_index_entry **cur_items;		/* current path in each iter */
	const git_index_entry *first_match;
	size_t i, j;
	int error = 0;

	iterator_item = git__calloc(cnt, sizeof(git_index_entry *));
	cur_items = git__calloc(cnt, sizeof(git_index_entry *));

	GITERR_CHECK_ALLOC(iterator_item);
	GITERR_CHECK_ALLOC(cur_items);

	/* Set up the iterators */
	for (i = 0; i < cnt; i++) {
		error = git_iterator_current(&iterator_item[i], iterators[i]);

		if (error < 0 && error != GIT_ITEROVER)
			goto done;
	}

	while (true) {
		for (i = 0; i < cnt; i++)
			cur_items[i] = NULL;

		first_match = NULL;

		/* Find the next path(s) to consume from each iterator */
		for (i = 0; i < cnt; i++) {
			if (iterator_item[i] == NULL)
				continue;

			if (first_match == NULL) {
				first_match = iterator_item[i];
				cur_items[i] = iterator_item[i];
			} else {
				int path_diff = git_index_entry_cmp(iterator_item[i], first_match);

				if (path_diff < 0) {
					/* Found an index entry that sorts before the one we're
					 * looking at.  Forget that we've seen the other and
					 * look at the other iterators for this path.
					 */
					for (j = 0; j < i; j++)
						cur_items[j] = NULL;

					first_match = iterator_item[i];
					cur_items[i] = iterator_item[i];
				} else if (path_diff == 0) {
					cur_items[i] = iterator_item[i];
				}
			}
		}

		if (first_match == NULL)
			break;

		if ((error = cb(cur_items, data)) != 0)
			goto done;

		/* Advance each iterator that participated */
		for (i = 0; i < cnt; i++) {
			if (cur_items[i] == NULL)
				continue;

			error = git_iterator_advance(&iterator_item[i], iterators[i]);

			if (error < 0 && error != GIT_ITEROVER)
				goto done;
		}
	}

done:
2299 2300
	git__free((git_index_entry **)iterator_item);
	git__free((git_index_entry **)cur_items);
2301

2302 2303 2304 2305 2306
	if (error == GIT_ITEROVER)
		error = 0;

	return error;
}