dir.c 69.3 KB
Newer Older
1 2 3 4
/*
 * This handles recursive filename detection with exclude
 * files, index knowledge etc..
 *
5 6
 * See Documentation/technical/api-directory-listing.txt
 *
7 8 9 10 11
 * Copyright (C) Linus Torvalds, 2005-2006
 *		 Junio Hamano, 2005-2006
 */
#include "cache.h"
#include "dir.h"
12
#include "refs.h"
13
#include "wildmatch.h"
14
#include "pathspec.h"
15
#include "utf8.h"
16 17
#include "varint.h"
#include "ewah/ewok.h"
18

19 20 21 22 23
struct path_simplify {
	int len;
	const char *path;
};

24 25 26 27 28 29 30 31 32 33 34 35 36
/*
 * Tells read_directory_recursive how a file or directory should be treated.
 * Values are ordered by significance, e.g. if a directory contains both
 * excluded and untracked files, it is listed as untracked because
 * path_untracked > path_excluded.
 */
enum path_treatment {
	path_none = 0,
	path_recurse,
	path_excluded,
	path_untracked
};

37 38 39 40 41 42
/*
 * Support data structure for our opendir/readdir/closedir wrappers
 */
struct cached_dir {
	DIR *fdir;
	struct untracked_cache_dir *untracked;
43 44 45
	int nr_files;
	int nr_dirs;

46
	struct dirent *de;
47 48
	const char *file;
	struct untracked_cache_dir *ucd;
49 50
};

51
static enum path_treatment read_directory_recursive(struct dir_struct *dir,
52
	const char *path, int len, struct untracked_cache_dir *untracked,
53
	int check_only, const struct path_simplify *simplify);
54
static int get_dtype(struct dirent *de, const char *path, int len);
55

56 57 58 59 60 61 62 63 64 65 66 67 68
/* helper string functions with support for the ignore_case flag */
int strcmp_icase(const char *a, const char *b)
{
	return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
}

int strncmp_icase(const char *a, const char *b, size_t count)
{
	return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
}

int fnmatch_icase(const char *pattern, const char *string, int flags)
{
69 70 71
	return wildmatch(pattern, string,
			 flags | (ignore_case ? WM_CASEFOLD : 0),
			 NULL);
72 73
}

74 75 76
int git_fnmatch(const struct pathspec_item *item,
		const char *pattern, const char *string,
		int prefix)
77 78
{
	if (prefix > 0) {
79
		if (ps_strncmp(item, pattern, string, prefix))
80
			return WM_NOMATCH;
81 82 83
		pattern += prefix;
		string += prefix;
	}
84
	if (item->flags & PATHSPEC_ONESTAR) {
85 86 87
		int pattern_len = strlen(++pattern);
		int string_len = strlen(string);
		return string_len < pattern_len ||
88 89
			ps_strcmp(item, pattern,
				  string + string_len - pattern_len);
90
	}
91
	if (item->magic & PATHSPEC_GLOB)
92 93 94 95
		return wildmatch(pattern, string,
				 WM_PATHNAME |
				 (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0),
				 NULL);
96 97
	else
		/* wildmatch has not learned no FNM_PATHNAME mode yet */
98 99 100
		return wildmatch(pattern, string,
				 item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0,
				 NULL);
101 102
}

103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
static int fnmatch_icase_mem(const char *pattern, int patternlen,
			     const char *string, int stringlen,
			     int flags)
{
	int match_status;
	struct strbuf pat_buf = STRBUF_INIT;
	struct strbuf str_buf = STRBUF_INIT;
	const char *use_pat = pattern;
	const char *use_str = string;

	if (pattern[patternlen]) {
		strbuf_add(&pat_buf, pattern, patternlen);
		use_pat = pat_buf.buf;
	}
	if (string[stringlen]) {
		strbuf_add(&str_buf, string, stringlen);
		use_str = str_buf.buf;
	}

122 123 124
	if (ignore_case)
		flags |= WM_CASEFOLD;
	match_status = wildmatch(use_pat, use_str, flags, NULL);
125 126 127 128 129 130 131

	strbuf_release(&pat_buf);
	strbuf_release(&str_buf);

	return match_status;
}

132
static size_t common_prefix_len(const struct pathspec *pathspec)
133
{
134
	int n;
135
	size_t max = 0;
136

137 138 139 140 141 142 143
	/*
	 * ":(icase)path" is treated as a pathspec full of
	 * wildcard. In other words, only prefix is considered common
	 * prefix. If the pathspec is abc/foo abc/bar, running in
	 * subdir xyz, the common prefix is still xyz, not xuz/abc as
	 * in non-:(icase).
	 */
144 145 146
	GUARD_PATHSPEC(pathspec,
		       PATHSPEC_FROMTOP |
		       PATHSPEC_MAXDEPTH |
147
		       PATHSPEC_LITERAL |
148
		       PATHSPEC_GLOB |
149 150
		       PATHSPEC_ICASE |
		       PATHSPEC_EXCLUDE);
151

152
	for (n = 0; n < pathspec->nr; n++) {
153
		size_t i = 0, len = 0, item_len;
154 155
		if (pathspec->items[n].magic & PATHSPEC_EXCLUDE)
			continue;
156 157 158 159 160
		if (pathspec->items[n].magic & PATHSPEC_ICASE)
			item_len = pathspec->items[n].prefix;
		else
			item_len = pathspec->items[n].nowildcard_len;
		while (i < item_len && (n == 0 || i < max)) {
161 162
			char c = pathspec->items[n].match[i];
			if (c != pathspec->items[0].match[i])
163 164 165
				break;
			if (c == '/')
				len = i + 1;
166
			i++;
167
		}
168
		if (n == 0 || len < max) {
169 170 171 172
			max = len;
			if (!max)
				break;
		}
173
	}
174
	return max;
175 176
}

177 178 179 180
/*
 * Returns a copy of the longest leading path common among all
 * pathspecs.
 */
181
char *common_prefix(const struct pathspec *pathspec)
182 183 184
{
	unsigned long len = common_prefix_len(pathspec);

185
	return len ? xmemdupz(pathspec->items[0].match, len) : NULL;
186 187
}

188
int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
189
{
190
	size_t len;
191 192 193 194 195

	/*
	 * Calculate common prefix for the pathspec, and
	 * use that to optimize the directory walk
	 */
196
	len = common_prefix_len(pathspec);
197 198

	/* Read the directory and prune it */
199
	read_directory(dir, pathspec->nr ? pathspec->_raw[0] : "", len, pathspec);
200
	return len;
201 202
}

203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
int within_depth(const char *name, int namelen,
			int depth, int max_depth)
{
	const char *cp = name, *cpe = name + namelen;

	while (cp < cpe) {
		if (*cp++ != '/')
			continue;
		depth++;
		if (depth > max_depth)
			return 0;
	}
	return 1;
}

218
#define DO_MATCH_EXCLUDE   1
219
#define DO_MATCH_DIRECTORY 2
220

221 222 223 224 225 226 227 228 229 230 231 232 233
/*
 * Does 'match' match the given name?
 * A match is found if
 *
 * (1) the 'match' string is leading directory of 'name', or
 * (2) the 'match' string is a wildcard and matches 'name', or
 * (3) the 'match' string is exactly the same as 'name'.
 *
 * and the return value tells which case it was.
 *
 * It returns 0 when there is no match.
 */
static int match_pathspec_item(const struct pathspec_item *item, int prefix,
234
			       const char *name, int namelen, unsigned flags)
235 236 237 238 239
{
	/* name/namelen has prefix cut off by caller */
	const char *match = item->match + prefix;
	int matchlen = item->len - prefix;

240 241 242 243
	/*
	 * The normal call pattern is:
	 * 1. prefix = common_prefix_len(ps);
	 * 2. prune something, or fill_directory
244
	 * 3. match_pathspec()
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
	 *
	 * 'prefix' at #1 may be shorter than the command's prefix and
	 * it's ok for #2 to match extra files. Those extras will be
	 * trimmed at #3.
	 *
	 * Suppose the pathspec is 'foo' and '../bar' running from
	 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
	 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
	 * user does not want XYZ/foo, only the "foo" part should be
	 * case-insensitive. We need to filter out XYZ/foo here. In
	 * other words, we do not trust the caller on comparing the
	 * prefix part when :(icase) is involved. We do exact
	 * comparison ourselves.
	 *
	 * Normally the caller (common_prefix_len() in fact) does
	 * _exact_ matching on name[-prefix+1..-1] and we do not need
	 * to check that part. Be defensive and check it anyway, in
	 * case common_prefix_len is changed, or a new caller is
	 * introduced that does not use common_prefix_len.
	 *
	 * If the penalty turns out too high when prefix is really
	 * long, maybe change it to
	 * strncmp(match, name, item->prefix - prefix)
	 */
	if (item->prefix && (item->magic & PATHSPEC_ICASE) &&
	    strncmp(item->match, name - prefix, item->prefix))
		return 0;

273 274 275 276
	/* If the match was just the prefix, we matched */
	if (!*match)
		return MATCHED_RECURSIVELY;

277
	if (matchlen <= namelen && !ps_strncmp(item, match, name, matchlen)) {
278 279 280 281 282
		if (matchlen == namelen)
			return MATCHED_EXACTLY;

		if (match[matchlen-1] == '/' || name[matchlen] == '/')
			return MATCHED_RECURSIVELY;
283 284 285 286 287
	} else if ((flags & DO_MATCH_DIRECTORY) &&
		   match[matchlen - 1] == '/' &&
		   namelen == matchlen - 1 &&
		   !ps_strncmp(item, match, name, namelen))
		return MATCHED_EXACTLY;
288

289
	if (item->nowildcard_len < item->len &&
290
	    !git_fnmatch(item, match, name,
291
			 item->nowildcard_len - prefix))
292 293 294 295 296 297
		return MATCHED_FNMATCH;

	return 0;
}

/*
298 299 300 301 302 303 304 305 306 307 308 309 310
 * Given a name and a list of pathspecs, returns the nature of the
 * closest (i.e. most specific) match of the name to any of the
 * pathspecs.
 *
 * The caller typically calls this multiple times with the same
 * pathspec and seen[] array but with different name/namelen
 * (e.g. entries from the index) and is interested in seeing if and
 * how each pathspec matches all the names it calls this function
 * with.  A mark is left in the seen[] array for each pathspec element
 * indicating the closest type of match that element achieved, so if
 * seen[n] remains zero after multiple invocations, that means the nth
 * pathspec did not match any names, which could indicate that the
 * user mistyped the nth pathspec.
311
 */
312 313 314
static int do_match_pathspec(const struct pathspec *ps,
			     const char *name, int namelen,
			     int prefix, char *seen,
315
			     unsigned flags)
316
{
317
	int i, retval = 0, exclude = flags & DO_MATCH_EXCLUDE;
318

319 320 321
	GUARD_PATHSPEC(ps,
		       PATHSPEC_FROMTOP |
		       PATHSPEC_MAXDEPTH |
322
		       PATHSPEC_LITERAL |
323
		       PATHSPEC_GLOB |
324 325
		       PATHSPEC_ICASE |
		       PATHSPEC_EXCLUDE);
326

327
	if (!ps->nr) {
328 329 330
		if (!ps->recursive ||
		    !(ps->magic & PATHSPEC_MAXDEPTH) ||
		    ps->max_depth == -1)
331 332 333 334 335 336 337 338 339 340 341 342 343
			return MATCHED_RECURSIVELY;

		if (within_depth(name, namelen, 0, ps->max_depth))
			return MATCHED_EXACTLY;
		else
			return 0;
	}

	name += prefix;
	namelen -= prefix;

	for (i = ps->nr - 1; i >= 0; i--) {
		int how;
344 345 346 347 348

		if ((!exclude &&   ps->items[i].magic & PATHSPEC_EXCLUDE) ||
		    ( exclude && !(ps->items[i].magic & PATHSPEC_EXCLUDE)))
			continue;

349 350
		if (seen && seen[i] == MATCHED_EXACTLY)
			continue;
351 352 353 354 355 356
		/*
		 * Make exclude patterns optional and never report
		 * "pathspec ':(exclude)foo' matches no files"
		 */
		if (seen && ps->items[i].magic & PATHSPEC_EXCLUDE)
			seen[i] = MATCHED_FNMATCH;
357 358
		how = match_pathspec_item(ps->items+i, prefix, name,
					  namelen, flags);
359 360 361
		if (ps->recursive &&
		    (ps->magic & PATHSPEC_MAXDEPTH) &&
		    ps->max_depth != -1 &&
362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380
		    how && how != MATCHED_FNMATCH) {
			int len = ps->items[i].len;
			if (name[len] == '/')
				len++;
			if (within_depth(name+len, namelen-len, 0, ps->max_depth))
				how = MATCHED_EXACTLY;
			else
				how = 0;
		}
		if (how) {
			if (retval < how)
				retval = how;
			if (seen && seen[i] < how)
				seen[i] = how;
		}
	}
	return retval;
}

381 382
int match_pathspec(const struct pathspec *ps,
		   const char *name, int namelen,
383
		   int prefix, char *seen, int is_dir)
384 385
{
	int positive, negative;
386
	unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
387 388
	positive = do_match_pathspec(ps, name, namelen,
				     prefix, seen, flags);
389 390
	if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
		return positive;
391 392 393
	negative = do_match_pathspec(ps, name, namelen,
				     prefix, seen,
				     flags | DO_MATCH_EXCLUDE);
394 395 396
	return negative ? 0 : positive;
}

397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437
int report_path_error(const char *ps_matched,
		      const struct pathspec *pathspec,
		      const char *prefix)
{
	/*
	 * Make sure all pathspec matched; otherwise it is an error.
	 */
	int num, errors = 0;
	for (num = 0; num < pathspec->nr; num++) {
		int other, found_dup;

		if (ps_matched[num])
			continue;
		/*
		 * The caller might have fed identical pathspec
		 * twice.  Do not barf on such a mistake.
		 * FIXME: parse_pathspec should have eliminated
		 * duplicate pathspec.
		 */
		for (found_dup = other = 0;
		     !found_dup && other < pathspec->nr;
		     other++) {
			if (other == num || !ps_matched[other])
				continue;
			if (!strcmp(pathspec->items[other].original,
				    pathspec->items[num].original))
				/*
				 * Ok, we have a match already.
				 */
				found_dup = 1;
		}
		if (found_dup)
			continue;

		error("pathspec '%s' did not match any file(s) known to git.",
		      pathspec->items[num].original);
		errors++;
	}
	return errors;
}

438 439 440
/*
 * Return the length of the "simple" part of a path match limiter.
 */
441
int simple_length(const char *match)
442 443 444 445 446 447 448 449 450 451 452
{
	int len = -1;

	for (;;) {
		unsigned char c = *match++;
		len++;
		if (c == '\0' || is_glob_special(c))
			return len;
	}
}

453
int no_wildcard(const char *string)
L
Lars Knoll 已提交
454
{
455
	return string[simple_length(string)] == '\0';
L
Lars Knoll 已提交
456 457
}

458 459 460 461
void parse_exclude_pattern(const char **pattern,
			   int *patternlen,
			   int *flags,
			   int *nowildcardlen)
462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495
{
	const char *p = *pattern;
	size_t i, len;

	*flags = 0;
	if (*p == '!') {
		*flags |= EXC_FLAG_NEGATIVE;
		p++;
	}
	len = strlen(p);
	if (len && p[len - 1] == '/') {
		len--;
		*flags |= EXC_FLAG_MUSTBEDIR;
	}
	for (i = 0; i < len; i++) {
		if (p[i] == '/')
			break;
	}
	if (i == len)
		*flags |= EXC_FLAG_NODIR;
	*nowildcardlen = simple_length(p);
	/*
	 * we should have excluded the trailing slash from 'p' too,
	 * but that's one more allocation. Instead just make sure
	 * nowildcardlen does not exceed real patternlen
	 */
	if (*nowildcardlen > len)
		*nowildcardlen = len;
	if (*p == '*' && no_wildcard(p + 1))
		*flags |= EXC_FLAG_ENDSWITH;
	*pattern = p;
	*patternlen = len;
}

496
void add_exclude(const char *string, const char *base,
497
		 int baselen, struct exclude_list *el, int srcpos)
498
{
499
	struct exclude *x;
500 501 502
	int patternlen;
	int flags;
	int nowildcardlen;
503

504 505
	parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen);
	if (flags & EXC_FLAG_MUSTBEDIR) {
506
		char *s;
507
		x = xmalloc(sizeof(*x) + patternlen + 1);
508
		s = (char *)(x+1);
509 510
		memcpy(s, string, patternlen);
		s[patternlen] = '\0';
511 512 513 514 515
		x->pattern = s;
	} else {
		x = xmalloc(sizeof(*x));
		x->pattern = string;
	}
516 517
	x->patternlen = patternlen;
	x->nowildcardlen = nowildcardlen;
518 519
	x->base = base;
	x->baselen = baselen;
520
	x->flags = flags;
521
	x->srcpos = srcpos;
522 523
	ALLOC_GROW(el->excludes, el->nr + 1, el->alloc);
	el->excludes[el->nr++] = x;
524
	x->el = el;
525 526
}

527 528
static void *read_skip_worktree_file_from_index(const char *path, size_t *size,
						struct sha1_stat *sha1_stat)
529 530 531 532 533 534 535
{
	int pos, len;
	unsigned long sz;
	enum object_type type;
	void *data;

	len = strlen(path);
536
	pos = cache_name_pos(path, len);
537 538
	if (pos < 0)
		return NULL;
539
	if (!ce_skip_worktree(active_cache[pos]))
540
		return NULL;
541
	data = read_sha1_file(active_cache[pos]->sha1, &type, &sz);
542 543 544 545 546
	if (!data || type != OBJ_BLOB) {
		free(data);
		return NULL;
	}
	*size = xsize_t(sz);
547 548 549 550
	if (sha1_stat) {
		memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat));
		hashcpy(sha1_stat->sha1, active_cache[pos]->sha1);
	}
551 552 553
	return data;
}

554 555 556 557 558
/*
 * Frees memory within el which was allocated for exclude patterns and
 * the file buffer.  Does not free el itself.
 */
void clear_exclude_list(struct exclude_list *el)
559 560 561 562 563 564
{
	int i;

	for (i = 0; i < el->nr; i++)
		free(el->excludes[i]);
	free(el->excludes);
565
	free(el->filebuf);
566

567
	memset(el, 0, sizeof(*el));
568 569
}

570
static void trim_trailing_spaces(char *buf)
571
{
572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590
	char *p, *last_space = NULL;

	for (p = buf; *p; p++)
		switch (*p) {
		case ' ':
			if (!last_space)
				last_space = p;
			break;
		case '\\':
			p++;
			if (!*p)
				return;
			/* fallthrough */
		default:
			last_space = NULL;
		}

	if (last_space)
		*last_space = '\0';
591 592
}

593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640
/*
 * Given a subdirectory name and "dir" of the current directory,
 * search the subdir in "dir" and return it, or create a new one if it
 * does not exist in "dir".
 *
 * If "name" has the trailing slash, it'll be excluded in the search.
 */
static struct untracked_cache_dir *lookup_untracked(struct untracked_cache *uc,
						    struct untracked_cache_dir *dir,
						    const char *name, int len)
{
	int first, last;
	struct untracked_cache_dir *d;
	if (!dir)
		return NULL;
	if (len && name[len - 1] == '/')
		len--;
	first = 0;
	last = dir->dirs_nr;
	while (last > first) {
		int cmp, next = (last + first) >> 1;
		d = dir->dirs[next];
		cmp = strncmp(name, d->name, len);
		if (!cmp && strlen(d->name) > len)
			cmp = -1;
		if (!cmp)
			return d;
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}

	uc->dir_created++;
	d = xmalloc(sizeof(*d) + len + 1);
	memset(d, 0, sizeof(*d));
	memcpy(d->name, name, len);
	d->name[len] = '\0';

	ALLOC_GROW(dir->dirs, dir->dirs_nr + 1, dir->dirs_alloc);
	memmove(dir->dirs + first + 1, dir->dirs + first,
		(dir->dirs_nr - first) * sizeof(*dir->dirs));
	dir->dirs_nr++;
	dir->dirs[first] = d;
	return d;
}

641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656
static void do_invalidate_gitignore(struct untracked_cache_dir *dir)
{
	int i;
	dir->valid = 0;
	dir->untracked_nr = 0;
	for (i = 0; i < dir->dirs_nr; i++)
		do_invalidate_gitignore(dir->dirs[i]);
}

static void invalidate_gitignore(struct untracked_cache *uc,
				 struct untracked_cache_dir *dir)
{
	uc->gitignore_invalidated++;
	do_invalidate_gitignore(dir);
}

657 658 659
static void invalidate_directory(struct untracked_cache *uc,
				 struct untracked_cache_dir *dir)
{
660
	int i;
661 662 663
	uc->dir_invalidated++;
	dir->valid = 0;
	dir->untracked_nr = 0;
664 665
	for (i = 0; i < dir->dirs_nr; i++)
		dir->dirs[i]->recurse = 0;
666 667
}

668 669 670 671 672 673 674 675 676 677 678 679
/*
 * Given a file with name "fname", read it (either from disk, or from
 * the index if "check_index" is non-zero), parse it and store the
 * exclude rules in "el".
 *
 * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
 * stat data from disk (only valid if add_excludes returns zero). If
 * ss_valid is non-zero, "ss" must contain good value as input.
 */
static int add_excludes(const char *fname, const char *base, int baselen,
			struct exclude_list *el, int check_index,
			struct sha1_stat *sha1_stat)
680
{
J
Jonas Fonseca 已提交
681
	struct stat st;
682
	int fd, i, lineno = 1;
683
	size_t size = 0;
684 685 686
	char *buf, *entry;

	fd = open(fname, O_RDONLY);
687
	if (fd < 0 || fstat(fd, &st) < 0) {
688
		if (errno != ENOENT)
689
			warn_on_inaccessible(fname);
690 691 692
		if (0 <= fd)
			close(fd);
		if (!check_index ||
693
		    (buf = read_skip_worktree_file_from_index(fname, &size, sha1_stat)) == NULL)
694
			return -1;
695 696 697 698 699 700 701 702
		if (size == 0) {
			free(buf);
			return 0;
		}
		if (buf[size-1] != '\n') {
			buf = xrealloc(buf, size+1);
			buf[size++] = '\n';
		}
703
	} else {
704 705
		size = xsize_t(st.st_size);
		if (size == 0) {
706 707 708 709 710
			if (sha1_stat) {
				fill_stat_data(&sha1_stat->stat, &st);
				hashcpy(sha1_stat->sha1, EMPTY_BLOB_SHA1_BIN);
				sha1_stat->valid = 1;
			}
711 712 713
			close(fd);
			return 0;
		}
714
		buf = xmalloc(size+1);
715
		if (read_in_full(fd, buf, size) != size) {
716
			free(buf);
717 718 719
			close(fd);
			return -1;
		}
720
		buf[size++] = '\n';
721
		close(fd);
722 723 724
		if (sha1_stat) {
			int pos;
			if (sha1_stat->valid &&
725
			    !match_stat_data_racy(&the_index, &sha1_stat->stat, &st))
726 727 728 729 730 731 732 733 734 735 736 737
				; /* no content change, ss->sha1 still good */
			else if (check_index &&
				 (pos = cache_name_pos(fname, strlen(fname))) >= 0 &&
				 !ce_stage(active_cache[pos]) &&
				 ce_uptodate(active_cache[pos]) &&
				 !would_convert_to_git(fname))
				hashcpy(sha1_stat->sha1, active_cache[pos]->sha1);
			else
				hash_sha1_file(buf, size, "blob", sha1_stat->sha1);
			fill_stat_data(&sha1_stat->stat, &st);
			sha1_stat->valid = 1;
		}
李鸿 已提交
738
	}
739

740
	el->filebuf = buf;
741

742 743 744
	if (skip_utf8_bom(&buf, size))
		size -= buf - el->filebuf;

745
	entry = buf;
746

747 748
	for (i = 0; i < size; i++) {
		if (buf[i] == '\n') {
749 750
			if (entry != buf + i && entry[0] != '#') {
				buf[i - (i && buf[i-1] == '\r')] = 0;
751
				trim_trailing_spaces(entry);
752
				add_exclude(entry, base, baselen, el, lineno);
753
			}
754
			lineno++;
755 756 757 758 759 760
			entry = buf + i + 1;
		}
	}
	return 0;
}

761 762 763 764 765 766 767
int add_excludes_from_file_to_list(const char *fname, const char *base,
				   int baselen, struct exclude_list *el,
				   int check_index)
{
	return add_excludes(fname, base, baselen, el, check_index, NULL);
}

768 769
struct exclude_list *add_exclude_list(struct dir_struct *dir,
				      int group_type, const char *src)
770 771 772 773 774 775 776 777
{
	struct exclude_list *el;
	struct exclude_list_group *group;

	group = &dir->exclude_list_group[group_type];
	ALLOC_GROW(group->el, group->nr + 1, group->alloc);
	el = &group->el[group->nr++];
	memset(el, 0, sizeof(*el));
778
	el->src = src;
779 780 781 782 783 784
	return el;
}

/*
 * Used to set up core.excludesfile and .git/info/exclude lists.
 */
785 786
static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
				     struct sha1_stat *sha1_stat)
787
{
788
	struct exclude_list *el;
789 790 791 792 793 794 795
	/*
	 * catch setup_standard_excludes() that's called before
	 * dir->untracked is assigned. That function behaves
	 * differently when dir->untracked is non-NULL.
	 */
	if (!dir->untracked)
		dir->unmanaged_exclude_files++;
796
	el = add_exclude_list(dir, EXC_FILE, fname);
797
	if (add_excludes(fname, "", 0, el, 0, sha1_stat) < 0)
798 799 800
		die("cannot use %s as an exclude file", fname);
}

801 802
void add_excludes_from_file(struct dir_struct *dir, const char *fname)
{
803
	dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */
804 805 806
	add_excludes_from_file_1(dir, fname, NULL);
}

807 808 809
int match_basename(const char *basename, int basenamelen,
		   const char *pattern, int prefix, int patternlen,
		   int flags)
810 811
{
	if (prefix == patternlen) {
812 813
		if (patternlen == basenamelen &&
		    !strncmp_icase(pattern, basename, basenamelen))
814 815
			return 1;
	} else if (flags & EXC_FLAG_ENDSWITH) {
816
		/* "*literal" matching against "fooliteral" */
817
		if (patternlen - 1 <= basenamelen &&
818 819 820
		    !strncmp_icase(pattern + 1,
				   basename + basenamelen - (patternlen - 1),
				   patternlen - 1))
821 822
			return 1;
	} else {
823 824 825
		if (fnmatch_icase_mem(pattern, patternlen,
				      basename, basenamelen,
				      0) == 0)
826 827 828 829 830
			return 1;
	}
	return 0;
}

831 832 833 834
int match_pathname(const char *pathname, int pathlen,
		   const char *base, int baselen,
		   const char *pattern, int prefix, int patternlen,
		   int flags)
835 836 837 838 839 840 841 842 843 844
{
	const char *name;
	int namelen;

	/*
	 * match with FNM_PATHNAME; the pattern has base implicitly
	 * in front of it.
	 */
	if (*pattern == '/') {
		pattern++;
845
		patternlen--;
846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871
		prefix--;
	}

	/*
	 * baselen does not count the trailing slash. base[] may or
	 * may not end with a trailing slash though.
	 */
	if (pathlen < baselen + 1 ||
	    (baselen && pathname[baselen] != '/') ||
	    strncmp_icase(pathname, base, baselen))
		return 0;

	namelen = baselen ? pathlen - baselen - 1 : pathlen;
	name = pathname + pathlen - namelen;

	if (prefix) {
		/*
		 * if the non-wildcard part is longer than the
		 * remaining pathname, surely it cannot match.
		 */
		if (prefix > namelen)
			return 0;

		if (strncmp_icase(pattern, name, prefix))
			return 0;
		pattern += prefix;
872
		patternlen -= prefix;
873 874
		name    += prefix;
		namelen -= prefix;
875 876 877 878 879 880 881 882

		/*
		 * If the whole pattern did not have a wildcard,
		 * then our prefix match is all we need; we
		 * do not need to call fnmatch at all.
		 */
		if (!patternlen && !namelen)
			return 1;
883 884
	}

885 886
	return fnmatch_icase_mem(pattern, patternlen,
				 name, namelen,
887
				 WM_PATHNAME) == 0;
888 889
}

890 891 892 893 894
/*
 * Scan the given exclude list in reverse to see whether pathname
 * should be ignored.  The first match (i.e. the last on the list), if
 * any, determines the fate.  Returns the exclude_list element which
 * matched, or NULL for undecided.
895
 */
896 897 898 899 900
static struct exclude *last_exclude_matching_from_list(const char *pathname,
						       int pathlen,
						       const char *basename,
						       int *dtype,
						       struct exclude_list *el)
901
{
902
	struct exclude *exc = NULL; /* undecided */
903
	int i;
904

905
	if (!el->nr)
906
		return NULL;	/* undefined */
907

908 909
	for (i = el->nr - 1; 0 <= i; i--) {
		struct exclude *x = el->excludes[i];
910 911
		const char *exclude = x->pattern;
		int prefix = x->nowildcardlen;
912 913 914 915 916 917 918

		if (x->flags & EXC_FLAG_MUSTBEDIR) {
			if (*dtype == DT_UNKNOWN)
				*dtype = get_dtype(NULL, pathname, pathlen);
			if (*dtype != DT_DIR)
				continue;
		}
919

920
		if (x->flags & EXC_FLAG_NODIR) {
921 922 923
			if (match_basename(basename,
					   pathlen - (basename - pathname),
					   exclude, prefix, x->patternlen,
924 925 926 927
					   x->flags)) {
				exc = x;
				break;
			}
928 929 930
			continue;
		}

931 932 933
		assert(x->baselen == 0 || x->base[x->baselen - 1] == '/');
		if (match_pathname(pathname, pathlen,
				   x->base, x->baselen ? x->baselen - 1 : 0,
934 935 936 937
				   exclude, prefix, x->patternlen, x->flags)) {
			exc = x;
			break;
		}
938
	}
939
	return exc;
940 941 942 943 944 945 946 947 948 949 950 951 952 953
}

/*
 * Scan the list and let the last match determine the fate.
 * Return 1 for exclude, 0 for include and -1 for undecided.
 */
int is_excluded_from_list(const char *pathname,
			  int pathlen, const char *basename, int *dtype,
			  struct exclude_list *el)
{
	struct exclude *exclude;
	exclude = last_exclude_matching_from_list(pathname, pathlen, basename, dtype, el);
	if (exclude)
		return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
954 955 956
	return -1; /* undecided */
}

957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976
static struct exclude *last_exclude_matching_from_lists(struct dir_struct *dir,
		const char *pathname, int pathlen, const char *basename,
		int *dtype_p)
{
	int i, j;
	struct exclude_list_group *group;
	struct exclude *exclude;
	for (i = EXC_CMDL; i <= EXC_FILE; i++) {
		group = &dir->exclude_list_group[i];
		for (j = group->nr - 1; j >= 0; j--) {
			exclude = last_exclude_matching_from_list(
				pathname, pathlen, basename, dtype_p,
				&group->el[j]);
			if (exclude)
				return exclude;
		}
	}
	return NULL;
}

K
Karsten Blees 已提交
977 978 979 980 981 982 983 984 985
/*
 * Loads the per-directory exclude list for the substring of base
 * which has a char length of baselen.
 */
static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
{
	struct exclude_list_group *group;
	struct exclude_list *el;
	struct exclude_stack *stk = NULL;
986
	struct untracked_cache_dir *untracked;
K
Karsten Blees 已提交
987 988 989 990
	int current;

	group = &dir->exclude_list_group[EXC_DIRS];

991 992
	/*
	 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
K
Karsten Blees 已提交
993
	 * which originate from directories not in the prefix of the
994 995
	 * path being checked.
	 */
K
Karsten Blees 已提交
996 997
	while ((stk = dir->exclude_stack) != NULL) {
		if (stk->baselen <= baselen &&
998
		    !strncmp(dir->basebuf.buf, base, stk->baselen))
K
Karsten Blees 已提交
999 1000 1001
			break;
		el = &group->el[dir->exclude_stack->exclude_ix];
		dir->exclude_stack = stk->prev;
1002
		dir->exclude = NULL;
1003
		free((char *)el->src); /* see strbuf_detach() below */
K
Karsten Blees 已提交
1004 1005 1006 1007 1008
		clear_exclude_list(el);
		free(stk);
		group->nr--;
	}

1009 1010 1011 1012
	/* Skip traversing into sub directories if the parent is excluded */
	if (dir->exclude)
		return;

1013 1014 1015 1016 1017 1018 1019 1020
	/*
	 * Lazy initialization. All call sites currently just
	 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
	 * them seems lots of work for little benefit.
	 */
	if (!dir->basebuf.buf)
		strbuf_init(&dir->basebuf, PATH_MAX);

K
Karsten Blees 已提交
1021 1022
	/* Read from the parent directories and push them down. */
	current = stk ? stk->baselen : -1;
1023
	strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current);
1024 1025 1026 1027 1028
	if (dir->untracked)
		untracked = stk ? stk->ucd : dir->untracked->root;
	else
		untracked = NULL;

K
Karsten Blees 已提交
1029 1030
	while (current < baselen) {
		const char *cp;
1031
		struct sha1_stat sha1_stat;
K
Karsten Blees 已提交
1032

1033
		stk = xcalloc(1, sizeof(*stk));
K
Karsten Blees 已提交
1034 1035 1036
		if (current < 0) {
			cp = base;
			current = 0;
1037
		} else {
K
Karsten Blees 已提交
1038 1039 1040 1041
			cp = strchr(base + current + 1, '/');
			if (!cp)
				die("oops in prep_exclude");
			cp++;
1042 1043 1044 1045
			untracked =
				lookup_untracked(dir->untracked, untracked,
						 base + current,
						 cp - base - current);
K
Karsten Blees 已提交
1046 1047 1048
		}
		stk->prev = dir->exclude_stack;
		stk->baselen = cp - base;
1049
		stk->exclude_ix = group->nr;
1050
		stk->ucd = untracked;
1051
		el = add_exclude_list(dir, EXC_DIRS, NULL);
1052 1053
		strbuf_add(&dir->basebuf, base + current, stk->baselen - current);
		assert(stk->baselen == dir->basebuf.len);
1054 1055 1056 1057

		/* Abort if the directory is excluded */
		if (stk->baselen) {
			int dt = DT_DIR;
1058
			dir->basebuf.buf[stk->baselen - 1] = 0;
1059
			dir->exclude = last_exclude_matching_from_lists(dir,
1060 1061 1062
				dir->basebuf.buf, stk->baselen - 1,
				dir->basebuf.buf + current, &dt);
			dir->basebuf.buf[stk->baselen - 1] = '/';
1063 1064 1065
			if (dir->exclude &&
			    dir->exclude->flags & EXC_FLAG_NEGATIVE)
				dir->exclude = NULL;
1066 1067 1068 1069 1070 1071
			if (dir->exclude) {
				dir->exclude_stack = stk;
				return;
			}
		}

1072
		/* Try to read per-directory file */
1073 1074
		hashclr(sha1_stat.sha1);
		sha1_stat.valid = 0;
1075 1076 1077 1078 1079 1080 1081 1082 1083
		if (dir->exclude_per_dir &&
		    /*
		     * If we know that no files have been added in
		     * this directory (i.e. valid_cached_dir() has
		     * been executed and set untracked->valid) ..
		     */
		    (!untracked || !untracked->valid ||
		     /*
		      * .. and .gitignore does not exist before
1084 1085 1086
		      * (i.e. null exclude_sha1). Then we can skip
		      * loading .gitignore, which would result in
		      * ENOENT anyway.
1087 1088
		      */
		     !is_null_sha1(untracked->exclude_sha1))) {
1089 1090 1091 1092 1093 1094
			/*
			 * dir->basebuf gets reused by the traversal, but we
			 * need fname to remain unchanged to ensure the src
			 * member of each struct exclude correctly
			 * back-references its source file.  Other invocations
			 * of add_exclude_list provide stable strings, so we
1095
			 * strbuf_detach() and free() here in the caller.
1096
			 */
1097 1098 1099 1100
			struct strbuf sb = STRBUF_INIT;
			strbuf_addbuf(&sb, &dir->basebuf);
			strbuf_addstr(&sb, dir->exclude_per_dir);
			el->src = strbuf_detach(&sb, NULL);
1101 1102 1103
			add_excludes(el->src, el->src, stk->baselen, el, 1,
				     untracked ? &sha1_stat : NULL);
		}
1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120
		/*
		 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
		 * will first be called in valid_cached_dir() then maybe many
		 * times more in last_exclude_matching(). When the cache is
		 * used, last_exclude_matching() will not be called and
		 * reading .gitignore content will be a waste.
		 *
		 * So when it's called by valid_cached_dir() and we can get
		 * .gitignore SHA-1 from the index (i.e. .gitignore is not
		 * modified on work tree), we could delay reading the
		 * .gitignore content until we absolutely need it in
		 * last_exclude_matching(). Be careful about ignore rule
		 * order, though, if you do that.
		 */
		if (untracked &&
		    hashcmp(sha1_stat.sha1, untracked->exclude_sha1)) {
			invalidate_gitignore(dir->untracked, untracked);
1121
			hashcpy(untracked->exclude_sha1, sha1_stat.sha1);
1122
		}
K
Karsten Blees 已提交
1123 1124 1125
		dir->exclude_stack = stk;
		current = stk->baselen;
	}
1126
	strbuf_setlen(&dir->basebuf, baselen);
K
Karsten Blees 已提交
1127 1128
}

A
Adam Spiers 已提交
1129 1130 1131 1132 1133 1134
/*
 * Loads the exclude lists for the directory containing pathname, then
 * scans all exclude lists to determine whether pathname is excluded.
 * Returns the exclude_list element which matched, or NULL for
 * undecided.
 */
1135
struct exclude *last_exclude_matching(struct dir_struct *dir,
A
Adam Spiers 已提交
1136 1137
					     const char *pathname,
					     int *dtype_p)
1138 1139
{
	int pathlen = strlen(pathname);
L
Lars Knoll 已提交
1140 1141
	const char *basename = strrchr(pathname, '/');
	basename = (basename) ? basename+1 : pathname;
1142

1143
	prep_exclude(dir, pathname, basename-pathname);
1144

1145 1146 1147
	if (dir->exclude)
		return dir->exclude;

1148 1149
	return last_exclude_matching_from_lists(dir, pathname, pathlen,
			basename, dtype_p);
A
Adam Spiers 已提交
1150 1151 1152 1153 1154 1155 1156
}

/*
 * Loads the exclude lists for the directory containing pathname, then
 * scans all exclude lists to determine whether pathname is excluded.
 * Returns 1 if true, otherwise 0.
 */
1157
int is_excluded(struct dir_struct *dir, const char *pathname, int *dtype_p)
A
Adam Spiers 已提交
1158 1159 1160 1161 1162
{
	struct exclude *exclude =
		last_exclude_matching(dir, pathname, dtype_p);
	if (exclude)
		return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
1163 1164 1165
	return 0;
}

1166 1167
static struct dir_entry *dir_entry_new(const char *pathname, int len)
{
1168 1169 1170 1171 1172 1173
	struct dir_entry *ent;

	ent = xmalloc(sizeof(*ent) + len + 1);
	ent->len = len;
	memcpy(ent->name, pathname, len);
	ent->name[len] = 0;
J
Junio C Hamano 已提交
1174
	return ent;
1175 1176
}

1177
static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len)
J
Jeff King 已提交
1178
{
1179
	if (cache_file_exists(pathname, len, ignore_case))
J
Jeff King 已提交
1180 1181
		return NULL;

1182
	ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);
J
Jeff King 已提交
1183 1184 1185
	return dir->entries[dir->nr++] = dir_entry_new(pathname, len);
}

1186
struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len)
1187
{
1188
	if (!cache_name_is_other(pathname, len))
1189 1190
		return NULL;

1191
	ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc);
1192 1193 1194
	return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len);
}

1195 1196 1197
enum exist_status {
	index_nonexistent = 0,
	index_directory,
1198
	index_gitdir
1199 1200
};

1201
/*
1202
 * Do not use the alphabetically sorted index to look up
1203
 * the directory name; instead, use the case insensitive
1204
 * directory hash.
1205 1206 1207
 */
static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
{
1208
	struct cache_entry *ce;
1209

1210
	if (cache_dir_exists(dirname, len))
1211 1212
		return index_directory;

1213 1214
	ce = cache_file_exists(dirname, len, ignore_case);
	if (ce && S_ISGITLINK(ce->ce_mode))
1215 1216 1217 1218 1219
		return index_gitdir;

	return index_nonexistent;
}

1220 1221 1222 1223 1224 1225 1226 1227
/*
 * The index sorts alphabetically by entry name, which
 * means that a gitlink sorts as '\0' at the end, while
 * a directory (which is defined not as an entry, but as
 * the files it contains) will sort with the '/' at the
 * end.
 */
static enum exist_status directory_exists_in_index(const char *dirname, int len)
1228
{
1229 1230 1231 1232 1233 1234
	int pos;

	if (ignore_case)
		return directory_exists_in_index_icase(dirname, len);

	pos = cache_name_pos(dirname, len);
1235 1236 1237
	if (pos < 0)
		pos = -pos-1;
	while (pos < active_nr) {
1238
		const struct cache_entry *ce = active_cache[pos++];
1239 1240 1241 1242 1243 1244 1245 1246 1247
		unsigned char endchar;

		if (strncmp(ce->name, dirname, len))
			break;
		endchar = ce->name[len];
		if (endchar > '/')
			break;
		if (endchar == '/')
			return index_directory;
1248
		if (!endchar && S_ISGITLINK(ce->ce_mode))
1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266
			return index_gitdir;
	}
	return index_nonexistent;
}

/*
 * When we find a directory when traversing the filesystem, we
 * have three distinct cases:
 *
 *  - ignore it
 *  - see it as a directory
 *  - recurse into it
 *
 * and which one we choose depends on a combination of existing
 * git index contents and the flags passed into the directory
 * traversal routine.
 *
 * Case 1: If we *already* have entries in the index under that
1267 1268
 * directory name, we always recurse into the directory to see
 * all the files.
1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279
 *
 * Case 2: If we *already* have that directory name as a gitlink,
 * we always continue to see it as a gitlink, regardless of whether
 * there is an actual git directory there or not (it might not
 * be checked out as a subproject!)
 *
 * Case 3: if we didn't have it in the index previously, we
 * have a few sub-cases:
 *
 *  (a) if "show_other_directories" is true, we show it as
 *      just a directory, unless "hide_empty_directories" is
1280 1281
 *      also true, in which case we need to check if it contains any
 *      untracked and / or ignored files.
1282
 *  (b) if it looks like a git directory, and we don't have
M
Martin Waitz 已提交
1283
 *      'no_gitlinks' set we treat it as a gitlink, and show it
1284 1285 1286
 *      as a directory.
 *  (c) otherwise, we recurse into it.
 */
1287
static enum path_treatment treat_directory(struct dir_struct *dir,
1288
	struct untracked_cache_dir *untracked,
1289
	const char *dirname, int len, int baselen, int exclude,
1290 1291 1292 1293 1294
	const struct path_simplify *simplify)
{
	/* The "len-1" is to strip the final '/' */
	switch (directory_exists_in_index(dirname, len-1)) {
	case index_directory:
1295
		return path_recurse;
1296 1297

	case index_gitdir:
1298
		return path_none;
1299 1300

	case index_nonexistent:
1301
		if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
1302
			break;
1303
		if (!(dir->flags & DIR_NO_GITLINKS)) {
1304 1305
			unsigned char sha1[20];
			if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)
1306
				return path_untracked;
1307
		}
1308
		return path_recurse;
1309 1310 1311
	}

	/* This is the "show_other_directories" case */
1312

1313
	if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
1314 1315
		return exclude ? path_excluded : path_untracked;

1316 1317
	untracked = lookup_untracked(dir->untracked, untracked,
				     dirname + baselen, len - baselen);
1318 1319
	return read_directory_recursive(dir, dirname, len,
					untracked, 1, simplify);
1320 1321
}

1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346
/*
 * This is an inexact early pruning of any recursive directory
 * reading - if the path cannot possibly be in the pathspec,
 * return true, and we'll skip it early.
 */
static int simplify_away(const char *path, int pathlen, const struct path_simplify *simplify)
{
	if (simplify) {
		for (;;) {
			const char *match = simplify->path;
			int len = simplify->len;

			if (!match)
				break;
			if (len > pathlen)
				len = pathlen;
			if (!memcmp(path, match, len))
				return 0;
			simplify++;
		}
		return 1;
	}
	return 0;
}

1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359
/*
 * This function tells us whether an excluded path matches a
 * list of "interesting" pathspecs. That is, whether a path matched
 * by any of the pathspecs could possibly be ignored by excluding
 * the specified path. This can happen if:
 *
 *   1. the path is mentioned explicitly in the pathspec
 *
 *   2. the path is a directory prefix of some element in the
 *      pathspec
 */
static int exclude_matches_pathspec(const char *path, int len,
		const struct path_simplify *simplify)
1360 1361 1362 1363 1364 1365
{
	if (simplify) {
		for (; simplify->path; simplify++) {
			if (len == simplify->len
			    && !memcmp(path, simplify->path, len))
				return 1;
1366 1367 1368 1369
			if (len < simplify->len
			    && simplify->path[len] == '/'
			    && !memcmp(path, simplify->path, len))
				return 1;
1370 1371 1372 1373 1374
		}
	}
	return 0;
}

1375 1376 1377
static int get_index_dtype(const char *path, int len)
{
	int pos;
1378
	const struct cache_entry *ce;
1379

1380
	ce = cache_file_exists(path, len, 0);
1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412
	if (ce) {
		if (!ce_uptodate(ce))
			return DT_UNKNOWN;
		if (S_ISGITLINK(ce->ce_mode))
			return DT_DIR;
		/*
		 * Nobody actually cares about the
		 * difference between DT_LNK and DT_REG
		 */
		return DT_REG;
	}

	/* Try to look it up as a directory */
	pos = cache_name_pos(path, len);
	if (pos >= 0)
		return DT_UNKNOWN;
	pos = -pos-1;
	while (pos < active_nr) {
		ce = active_cache[pos++];
		if (strncmp(ce->name, path, len))
			break;
		if (ce->name[len] > '/')
			break;
		if (ce->name[len] < '/')
			continue;
		if (!ce_uptodate(ce))
			break;	/* continue? */
		return DT_DIR;
	}
	return DT_UNKNOWN;
}

1413
static int get_dtype(struct dirent *de, const char *path, int len)
1414
{
J
Junio C Hamano 已提交
1415
	int dtype = de ? DTYPE(de) : DT_UNKNOWN;
1416 1417 1418 1419
	struct stat st;

	if (dtype != DT_UNKNOWN)
		return dtype;
1420 1421 1422 1423
	dtype = get_index_dtype(path, len);
	if (dtype != DT_UNKNOWN)
		return dtype;
	if (lstat(path, &st))
1424 1425 1426 1427 1428 1429 1430 1431 1432 1433
		return dtype;
	if (S_ISREG(st.st_mode))
		return DT_REG;
	if (S_ISDIR(st.st_mode))
		return DT_DIR;
	if (S_ISLNK(st.st_mode))
		return DT_LNK;
	return dtype;
}

1434
static enum path_treatment treat_one_path(struct dir_struct *dir,
1435
					  struct untracked_cache_dir *untracked,
R
René Scharfe 已提交
1436
					  struct strbuf *path,
1437
					  int baselen,
1438 1439
					  const struct path_simplify *simplify,
					  int dtype, struct dirent *de)
1440
{
1441
	int exclude;
1442
	int has_path_in_index = !!cache_file_exists(path->buf, path->len, ignore_case);
1443

1444 1445 1446 1447
	if (dtype == DT_UNKNOWN)
		dtype = get_dtype(de, path->buf, path->len);

	/* Always exclude indexed files */
1448
	if (dtype != DT_DIR && has_path_in_index)
1449
		return path_none;
1450

1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470
	/*
	 * When we are looking at a directory P in the working tree,
	 * there are three cases:
	 *
	 * (1) P exists in the index.  Everything inside the directory P in
	 * the working tree needs to go when P is checked out from the
	 * index.
	 *
	 * (2) P does not exist in the index, but there is P/Q in the index.
	 * We know P will stay a directory when we check out the contents
	 * of the index, but we do not know yet if there is a directory
	 * P/Q in the working tree to be killed, so we need to recurse.
	 *
	 * (3) P does not exist in the index, and there is no P/Q in the index
	 * to require P to be a directory, either.  Only in this case, we
	 * know that everything inside P will not be killed without
	 * recursing.
	 */
	if ((dir->flags & DIR_COLLECT_KILLED_ONLY) &&
	    (dtype == DT_DIR) &&
1471 1472 1473
	    !has_path_in_index &&
	    (directory_exists_in_index(path->buf, path->len) == index_nonexistent))
		return path_none;
1474 1475

	exclude = is_excluded(dir, path->buf, &dtype);
1476 1477 1478 1479 1480

	/*
	 * Excluded? If we don't explicitly want to show
	 * ignored files, ignore it
	 */
1481
	if (exclude && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO)))
1482
		return path_excluded;
1483 1484 1485

	switch (dtype) {
	default:
1486
		return path_none;
1487
	case DT_DIR:
R
René Scharfe 已提交
1488
		strbuf_addch(path, '/');
1489 1490
		return treat_directory(dir, untracked, path->buf, path->len,
				       baselen, exclude, simplify);
1491 1492
	case DT_REG:
	case DT_LNK:
1493
		return exclude ? path_excluded : path_untracked;
1494 1495 1496
	}
}

1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510
static enum path_treatment treat_path_fast(struct dir_struct *dir,
					   struct untracked_cache_dir *untracked,
					   struct cached_dir *cdir,
					   struct strbuf *path,
					   int baselen,
					   const struct path_simplify *simplify)
{
	strbuf_setlen(path, baselen);
	if (!cdir->ucd) {
		strbuf_addstr(path, cdir->file);
		return path_untracked;
	}
	strbuf_addstr(path, cdir->ucd->name);
	/* treat_one_path() does this before it calls treat_directory() */
1511
	strbuf_complete(path, '/');
1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528
	if (cdir->ucd->check_only)
		/*
		 * check_only is set as a result of treat_directory() getting
		 * to its bottom. Verify again the same set of directories
		 * with check_only set.
		 */
		return read_directory_recursive(dir, path->buf, path->len,
						cdir->ucd, 1, simplify);
	/*
	 * We get path_recurse in the first run when
	 * directory_exists_in_index() returns index_nonexistent. We
	 * are sure that new changes in the index does not impact the
	 * outcome. Return now.
	 */
	return path_recurse;
}

1529
static enum path_treatment treat_path(struct dir_struct *dir,
1530
				      struct untracked_cache_dir *untracked,
1531
				      struct cached_dir *cdir,
R
René Scharfe 已提交
1532
				      struct strbuf *path,
1533
				      int baselen,
R
René Scharfe 已提交
1534
				      const struct path_simplify *simplify)
1535 1536
{
	int dtype;
1537
	struct dirent *de = cdir->de;
1538

1539 1540 1541
	if (!de)
		return treat_path_fast(dir, untracked, cdir, path,
				       baselen, simplify);
1542
	if (is_dot_or_dotdot(de->d_name) || !strcmp(de->d_name, ".git"))
1543
		return path_none;
R
René Scharfe 已提交
1544 1545 1546
	strbuf_setlen(path, baselen);
	strbuf_addstr(path, de->d_name);
	if (simplify_away(path->buf, path->len, simplify))
1547
		return path_none;
1548 1549

	dtype = DTYPE(de);
1550
	return treat_one_path(dir, untracked, path, baselen, simplify, dtype, de);
1551 1552 1553 1554 1555 1556 1557 1558 1559
}

static void add_untracked(struct untracked_cache_dir *dir, const char *name)
{
	if (!dir)
		return;
	ALLOC_GROW(dir->untracked, dir->untracked_nr + 1,
		   dir->untracked_alloc);
	dir->untracked[dir->untracked_nr++] = xstrdup(name);
1560 1561
}

1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577
static int valid_cached_dir(struct dir_struct *dir,
			    struct untracked_cache_dir *untracked,
			    struct strbuf *path,
			    int check_only)
{
	struct stat st;

	if (!untracked)
		return 0;

	if (stat(path->len ? path->buf : ".", &st)) {
		invalidate_directory(dir->untracked, untracked);
		memset(&untracked->stat_data, 0, sizeof(untracked->stat_data));
		return 0;
	}
	if (!untracked->valid ||
1578
	    match_stat_data_racy(&the_index, &untracked->stat_data, &st)) {
1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607
		if (untracked->valid)
			invalidate_directory(dir->untracked, untracked);
		fill_stat_data(&untracked->stat_data, &st);
		return 0;
	}

	if (untracked->check_only != !!check_only) {
		invalidate_directory(dir->untracked, untracked);
		return 0;
	}

	/*
	 * prep_exclude will be called eventually on this directory,
	 * but it's called much later in last_exclude_matching(). We
	 * need it now to determine the validity of the cache for this
	 * path. The next calls will be nearly no-op, the way
	 * prep_exclude() is designed.
	 */
	if (path->len && path->buf[path->len - 1] != '/') {
		strbuf_addch(path, '/');
		prep_exclude(dir, path->buf, path->len);
		strbuf_setlen(path, path->len - 1);
	} else
		prep_exclude(dir, path->buf, path->len);

	/* hopefully prep_exclude() haven't invalidated this entry... */
	return untracked->valid;
}

1608 1609 1610 1611 1612 1613 1614 1615
static int open_cached_dir(struct cached_dir *cdir,
			   struct dir_struct *dir,
			   struct untracked_cache_dir *untracked,
			   struct strbuf *path,
			   int check_only)
{
	memset(cdir, 0, sizeof(*cdir));
	cdir->untracked = untracked;
1616 1617
	if (valid_cached_dir(dir, untracked, path, check_only))
		return 0;
1618
	cdir->fdir = opendir(path->len ? path->buf : ".");
1619 1620
	if (dir->untracked)
		dir->untracked->dir_opened++;
1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633
	if (!cdir->fdir)
		return -1;
	return 0;
}

static int read_cached_dir(struct cached_dir *cdir)
{
	if (cdir->fdir) {
		cdir->de = readdir(cdir->fdir);
		if (!cdir->de)
			return -1;
		return 0;
	}
1634 1635
	while (cdir->nr_dirs < cdir->untracked->dirs_nr) {
		struct untracked_cache_dir *d = cdir->untracked->dirs[cdir->nr_dirs];
1636 1637 1638 1639
		if (!d->recurse) {
			cdir->nr_dirs++;
			continue;
		}
1640 1641 1642 1643 1644 1645 1646 1647 1648 1649
		cdir->ucd = d;
		cdir->nr_dirs++;
		return 0;
	}
	cdir->ucd = NULL;
	if (cdir->nr_files < cdir->untracked->untracked_nr) {
		struct untracked_cache_dir *d = cdir->untracked;
		cdir->file = d->untracked[cdir->nr_files++];
		return 0;
	}
1650 1651 1652 1653 1654 1655 1656
	return -1;
}

static void close_cached_dir(struct cached_dir *cdir)
{
	if (cdir->fdir)
		closedir(cdir->fdir);
1657 1658 1659 1660
	/*
	 * We have gone through this directory and found no untracked
	 * entries. Mark it valid.
	 */
1661
	if (cdir->untracked) {
1662
		cdir->untracked->valid = 1;
1663 1664
		cdir->untracked->recurse = 1;
	}
1665 1666
}

1667 1668 1669 1670 1671 1672 1673 1674
/*
 * Read a directory tree. We currently ignore anything but
 * directories, regular files and symlinks. That's because git
 * doesn't handle them at all yet. Maybe that will change some
 * day.
 *
 * Also, we ignore the name ".git" (even if it is not a directory).
 * That likely will not change.
1675 1676
 *
 * Returns the most significant path_treatment value encountered in the scan.
1677
 */
1678
static enum path_treatment read_directory_recursive(struct dir_struct *dir,
1679
				    const char *base, int baselen,
1680
				    struct untracked_cache_dir *untracked, int check_only,
1681
				    const struct path_simplify *simplify)
1682
{
1683
	struct cached_dir cdir;
1684
	enum path_treatment state, subdir_state, dir_state = path_none;
1685
	struct strbuf path = STRBUF_INIT;
1686

1687
	strbuf_add(&path, base, baselen);
1688

1689
	if (open_cached_dir(&cdir, dir, untracked, &path, check_only))
1690 1691
		goto out;

1692 1693 1694
	if (untracked)
		untracked->check_only = !!check_only;

1695
	while (!read_cached_dir(&cdir)) {
1696
		/* check how the file or directory should be treated */
1697
		state = treat_path(dir, untracked, &cdir, &path, baselen, simplify);
1698

1699 1700 1701 1702 1703
		if (state > dir_state)
			dir_state = state;

		/* recurse into subdir if instructed by treat_path */
		if (state == path_recurse) {
1704 1705 1706 1707 1708 1709 1710
			struct untracked_cache_dir *ud;
			ud = lookup_untracked(dir->untracked, untracked,
					      path.buf + baselen,
					      path.len - baselen);
			subdir_state =
				read_directory_recursive(dir, path.buf, path.len,
							 ud, check_only, simplify);
1711 1712 1713 1714 1715 1716
			if (subdir_state > dir_state)
				dir_state = subdir_state;
		}

		if (check_only) {
			/* abort early if maximum state has been reached */
1717
			if (dir_state == path_untracked) {
1718
				if (cdir.fdir)
1719
					add_untracked(untracked, path.buf + baselen);
1720
				break;
1721
			}
1722
			/* skip the dir_add_* part */
1723
			continue;
1724
		}
1725 1726 1727 1728 1729 1730

		/* add the path to the appropriate result list */
		switch (state) {
		case path_excluded:
			if (dir->flags & DIR_SHOW_IGNORED)
				dir_add_name(dir, path.buf, path.len);
1731 1732 1733 1734 1735
			else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
				((dir->flags & DIR_COLLECT_IGNORED) &&
				exclude_matches_pathspec(path.buf, path.len,
					simplify)))
				dir_add_ignored(dir, path.buf, path.len);
1736 1737 1738
			break;

		case path_untracked:
1739 1740 1741
			if (dir->flags & DIR_SHOW_IGNORED)
				break;
			dir_add_name(dir, path.buf, path.len);
1742
			if (cdir.fdir)
1743
				add_untracked(untracked, path.buf + baselen);
1744
			break;
1745 1746 1747 1748

		default:
			break;
		}
1749
	}
1750
	close_cached_dir(&cdir);
1751
 out:
1752
	strbuf_release(&path);
1753

1754
	return dir_state;
1755 1756 1757 1758 1759 1760 1761
}

static int cmp_name(const void *p1, const void *p2)
{
	const struct dir_entry *e1 = *(const struct dir_entry **)p1;
	const struct dir_entry *e2 = *(const struct dir_entry **)p2;

1762
	return name_compare(e1->name, e1->len, e2->name, e2->len);
1763 1764
}

1765 1766 1767 1768 1769 1770 1771 1772 1773 1774
static struct path_simplify *create_simplify(const char **pathspec)
{
	int nr, alloc = 0;
	struct path_simplify *simplify = NULL;

	if (!pathspec)
		return NULL;

	for (nr = 0 ; ; nr++) {
		const char *match;
1775
		ALLOC_GROW(simplify, nr + 1, alloc);
1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788
		match = *pathspec++;
		if (!match)
			break;
		simplify[nr].path = match;
		simplify[nr].len = simple_length(match);
	}
	simplify[nr].path = NULL;
	simplify[nr].len = 0;
	return simplify;
}

static void free_simplify(struct path_simplify *simplify)
{
1789
	free(simplify);
1790 1791
}

1792 1793 1794 1795
static int treat_leading_path(struct dir_struct *dir,
			      const char *path, int len,
			      const struct path_simplify *simplify)
{
R
René Scharfe 已提交
1796 1797
	struct strbuf sb = STRBUF_INIT;
	int baselen, rc = 0;
1798
	const char *cp;
1799
	int old_flags = dir->flags;
1800 1801 1802 1803 1804 1805

	while (len && path[len - 1] == '/')
		len--;
	if (!len)
		return 1;
	baselen = 0;
1806
	dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES;
1807 1808 1809 1810 1811 1812 1813
	while (1) {
		cp = path + baselen + !!baselen;
		cp = memchr(cp, '/', path + len - cp);
		if (!cp)
			baselen = len;
		else
			baselen = cp - path;
R
René Scharfe 已提交
1814 1815 1816 1817 1818 1819
		strbuf_setlen(&sb, 0);
		strbuf_add(&sb, path, baselen);
		if (!is_directory(sb.buf))
			break;
		if (simplify_away(sb.buf, sb.len, simplify))
			break;
1820
		if (treat_one_path(dir, NULL, &sb, baselen, simplify,
1821
				   DT_DIR, NULL) == path_none)
R
René Scharfe 已提交
1822 1823 1824 1825 1826
			break; /* do not recurse into it */
		if (len <= baselen) {
			rc = 1;
			break; /* finished checking */
		}
1827
	}
R
René Scharfe 已提交
1828
	strbuf_release(&sb);
1829
	dir->flags = old_flags;
R
René Scharfe 已提交
1830
	return rc;
1831 1832
}

1833 1834 1835 1836 1837 1838 1839
static const char *get_ident_string(void)
{
	static struct strbuf sb = STRBUF_INIT;
	struct utsname uts;

	if (sb.len)
		return sb.buf;
1840
	if (uname(&uts) < 0)
1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866
		die_errno(_("failed to get kernel name and information"));
	strbuf_addf(&sb, "Location %s, system %s %s %s", get_git_work_tree(),
		    uts.sysname, uts.release, uts.version);
	return sb.buf;
}

static int ident_in_untracked(const struct untracked_cache *uc)
{
	const char *end = uc->ident.buf + uc->ident.len;
	const char *p   = uc->ident.buf;

	for (p = uc->ident.buf; p < end; p += strlen(p) + 1)
		if (!strcmp(p, get_ident_string()))
			return 1;
	return 0;
}

void add_untracked_ident(struct untracked_cache *uc)
{
	if (ident_in_untracked(uc))
		return;
	strbuf_addstr(&uc->ident, get_ident_string());
	/* this strbuf contains a list of strings, save NUL too */
	strbuf_addch(&uc->ident, 0);
}

1867 1868 1869 1870 1871 1872
static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir,
						      int base_len,
						      const struct pathspec *pathspec)
{
	struct untracked_cache_dir *root;

1873
	if (!dir->untracked || getenv("GIT_DISABLE_UNTRACKED_CACHE"))
1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922
		return NULL;

	/*
	 * We only support $GIT_DIR/info/exclude and core.excludesfile
	 * as the global ignore rule files. Any other additions
	 * (e.g. from command line) invalidate the cache. This
	 * condition also catches running setup_standard_excludes()
	 * before setting dir->untracked!
	 */
	if (dir->unmanaged_exclude_files)
		return NULL;

	/*
	 * Optimize for the main use case only: whole-tree git
	 * status. More work involved in treat_leading_path() if we
	 * use cache on just a subset of the worktree. pathspec
	 * support could make the matter even worse.
	 */
	if (base_len || (pathspec && pathspec->nr))
		return NULL;

	/* Different set of flags may produce different results */
	if (dir->flags != dir->untracked->dir_flags ||
	    /*
	     * See treat_directory(), case index_nonexistent. Without
	     * this flag, we may need to also cache .git file content
	     * for the resolve_gitlink_ref() call, which we don't.
	     */
	    !(dir->flags & DIR_SHOW_OTHER_DIRECTORIES) ||
	    /* We don't support collecting ignore files */
	    (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
			   DIR_COLLECT_IGNORED)))
		return NULL;

	/*
	 * If we use .gitignore in the cache and now you change it to
	 * .gitexclude, everything will go wrong.
	 */
	if (dir->exclude_per_dir != dir->untracked->exclude_per_dir &&
	    strcmp(dir->exclude_per_dir, dir->untracked->exclude_per_dir))
		return NULL;

	/*
	 * EXC_CMDL is not considered in the cache. If people set it,
	 * skip the cache.
	 */
	if (dir->exclude_list_group[EXC_CMDL].nr)
		return NULL;

1923 1924 1925 1926 1927
	if (!ident_in_untracked(dir->untracked)) {
		warning(_("Untracked cache is disabled on this system."));
		return NULL;
	}

1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945
	if (!dir->untracked->root) {
		const int len = sizeof(*dir->untracked->root);
		dir->untracked->root = xmalloc(len);
		memset(dir->untracked->root, 0, len);
	}

	/* Validate $GIT_DIR/info/exclude and core.excludesfile */
	root = dir->untracked->root;
	if (hashcmp(dir->ss_info_exclude.sha1,
		    dir->untracked->ss_info_exclude.sha1)) {
		invalidate_gitignore(dir->untracked, root);
		dir->untracked->ss_info_exclude = dir->ss_info_exclude;
	}
	if (hashcmp(dir->ss_excludes_file.sha1,
		    dir->untracked->ss_excludes_file.sha1)) {
		invalidate_gitignore(dir->untracked, root);
		dir->untracked->ss_excludes_file = dir->ss_excludes_file;
	}
1946 1947 1948

	/* Make sure this directory is not dropped out at saving phase */
	root->recurse = 1;
1949 1950 1951
	return root;
}

1952
int read_directory(struct dir_struct *dir, const char *path, int len, const struct pathspec *pathspec)
1953
{
1954
	struct path_simplify *simplify;
1955
	struct untracked_cache_dir *untracked;
1956

1957 1958 1959 1960
	/*
	 * Check out create_simplify()
	 */
	if (pathspec)
1961 1962 1963
		GUARD_PATHSPEC(pathspec,
			       PATHSPEC_FROMTOP |
			       PATHSPEC_MAXDEPTH |
1964
			       PATHSPEC_LITERAL |
1965
			       PATHSPEC_GLOB |
1966 1967
			       PATHSPEC_ICASE |
			       PATHSPEC_EXCLUDE);
1968

1969
	if (has_symlink_leading_path(path, len))
1970 1971
		return dir->nr;

1972 1973 1974 1975 1976 1977
	/*
	 * exclude patterns are treated like positive ones in
	 * create_simplify. Usually exclude patterns should be a
	 * subset of positive ones, which has no impacts on
	 * create_simplify().
	 */
1978
	simplify = create_simplify(pathspec ? pathspec->_raw : NULL);
1979 1980 1981 1982 1983 1984 1985
	untracked = validate_untracked_cache(dir, len, pathspec);
	if (!untracked)
		/*
		 * make sure untracked cache code path is disabled,
		 * e.g. prep_exclude()
		 */
		dir->untracked = NULL;
1986
	if (!len || treat_leading_path(dir, path, len, simplify))
1987
		read_directory_recursive(dir, path, len, untracked, 0, simplify);
1988
	free_simplify(simplify);
1989
	qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name);
1990
	qsort(dir->ignored, dir->ignored_nr, sizeof(struct dir_entry *), cmp_name);
1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001
	if (dir->untracked) {
		static struct trace_key trace_untracked_stats = TRACE_KEY_INIT(UNTRACKED_STATS);
		trace_printf_key(&trace_untracked_stats,
				 "node creation: %u\n"
				 "gitignore invalidation: %u\n"
				 "directory invalidation: %u\n"
				 "opendir: %u\n",
				 dir->untracked->dir_created,
				 dir->untracked->gitignore_invalidated,
				 dir->untracked->dir_invalidated,
				 dir->untracked->dir_opened);
2002 2003 2004 2005 2006 2007 2008 2009 2010
		if (dir->untracked == the_index.untracked &&
		    (dir->untracked->dir_opened ||
		     dir->untracked->gitignore_invalidated ||
		     dir->untracked->dir_invalidated))
			the_index.cache_changed |= UNTRACKED_CHANGED;
		if (dir->untracked != the_index.untracked) {
			free(dir->untracked);
			dir->untracked = NULL;
		}
2011
	}
2012 2013
	return dir->nr;
}
2014

J
Junio C Hamano 已提交
2015
int file_exists(const char *f)
2016
{
J
Junio C Hamano 已提交
2017
	struct stat sb;
2018
	return lstat(f, &sb) == 0;
2019
}
2020

2021 2022 2023 2024 2025 2026 2027 2028 2029
static int cmp_icase(char a, char b)
{
	if (a == b)
		return 0;
	if (ignore_case)
		return toupper(a) - toupper(b);
	return a - b;
}

2030
/*
2031 2032 2033
 * Given two normalized paths (a trailing slash is ok), if subdir is
 * outside dir, return -1.  Otherwise return the offset in subdir that
 * can be used as relative path to dir.
2034
 */
2035
int dir_inside_of(const char *subdir, const char *dir)
2036
{
2037
	int offset = 0;
2038

2039
	assert(dir && subdir && *dir && *subdir);
2040

2041
	while (*dir && *subdir && !cmp_icase(*dir, *subdir)) {
2042
		dir++;
2043 2044
		subdir++;
		offset++;
2045
	}
2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059

	/* hel[p]/me vs hel[l]/yeah */
	if (*dir && *subdir)
		return -1;

	if (!*subdir)
		return !*dir ? offset : -1; /* same dir */

	/* foo/[b]ar vs foo/[] */
	if (is_dir_sep(dir[-1]))
		return is_dir_sep(subdir[-1]) ? offset : -1;

	/* foo[/]bar vs foo[] */
	return is_dir_sep(*subdir) ? offset + 1 : -1;
2060 2061 2062 2063
}

int is_inside_dir(const char *dir)
{
2064 2065 2066
	char *cwd;
	int rc;

2067 2068
	if (!dir)
		return 0;
2069 2070 2071 2072 2073

	cwd = xgetcwd();
	rc = (dir_inside_of(cwd, dir) >= 0);
	free(cwd);
	return rc;
2074
}
2075

2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094
int is_empty_dir(const char *path)
{
	DIR *dir = opendir(path);
	struct dirent *e;
	int ret = 1;

	if (!dir)
		return 0;

	while ((e = readdir(dir)) != NULL)
		if (!is_dot_or_dotdot(e->d_name)) {
			ret = 0;
			break;
		}

	closedir(dir);
	return ret;
}

2095
static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
2096
{
2097
	DIR *dir;
2098
	struct dirent *e;
2099
	int ret = 0, original_len = path->len, len, kept_down = 0;
2100
	int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY);
2101
	int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL);
2102
	unsigned char submodule_head[20];
2103

2104
	if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
2105
	    !resolve_gitlink_ref(path->buf, "HEAD", submodule_head)) {
2106
		/* Do not descend and nuke a nested git work tree. */
2107 2108
		if (kept_up)
			*kept_up = 1;
2109
		return 0;
2110
	}
2111

2112
	flag &= ~REMOVE_DIR_KEEP_TOPLEVEL;
2113
	dir = opendir(path->buf);
2114
	if (!dir) {
2115 2116 2117
		if (errno == ENOENT)
			return keep_toplevel ? -1 : 0;
		else if (errno == EACCES && !keep_toplevel)
2118 2119 2120 2121
			/*
			 * An empty dir could be removable even if it
			 * is unreadable:
			 */
2122 2123 2124 2125
			return rmdir(path->buf);
		else
			return -1;
	}
2126
	strbuf_complete(path, '/');
2127 2128 2129 2130

	len = path->len;
	while ((e = readdir(dir)) != NULL) {
		struct stat st;
2131 2132
		if (is_dot_or_dotdot(e->d_name))
			continue;
2133 2134 2135

		strbuf_setlen(path, len);
		strbuf_addstr(path, e->d_name);
2136 2137 2138 2139 2140 2141 2142 2143 2144
		if (lstat(path->buf, &st)) {
			if (errno == ENOENT)
				/*
				 * file disappeared, which is what we
				 * wanted anyway
				 */
				continue;
			/* fall thru */
		} else if (S_ISDIR(st.st_mode)) {
2145
			if (!remove_dir_recurse(path, flag, &kept_down))
2146
				continue; /* happy */
2147 2148
		} else if (!only_empty &&
			   (!unlink(path->buf) || errno == ENOENT)) {
2149
			continue; /* happy, too */
2150
		}
2151 2152 2153 2154 2155 2156 2157 2158

		/* path too long, stat fails, or non-directory still exists */
		ret = -1;
		break;
	}
	closedir(dir);

	strbuf_setlen(path, original_len);
2159
	if (!ret && !keep_toplevel && !kept_down)
2160
		ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
2161 2162 2163 2164 2165 2166
	else if (kept_up)
		/*
		 * report the uplevel that it is not an error that we
		 * did not rmdir() our directory.
		 */
		*kept_up = !ret;
2167 2168
	return ret;
}
J
Junio C Hamano 已提交
2169

2170 2171 2172 2173 2174
int remove_dir_recursively(struct strbuf *path, int flag)
{
	return remove_dir_recurse(path, flag, NULL);
}

2175 2176
static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude")

J
Junio C Hamano 已提交
2177 2178 2179 2180 2181
void setup_standard_excludes(struct dir_struct *dir)
{
	const char *path;

	dir->exclude_per_dir = ".gitignore";
2182 2183

	/* core.excludefile defaulting to $XDG_HOME/git/ignore */
2184 2185
	if (!excludes_file)
		excludes_file = xdg_config_home("ignore");
2186
	if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
2187 2188
		add_excludes_from_file_1(dir, excludes_file,
					 dir->untracked ? &dir->ss_excludes_file : NULL);
2189 2190

	/* per repository user preference */
2191
	path = git_path_info_exclude();
2192
	if (!access_or_warn(path, R_OK, 0))
2193 2194
		add_excludes_from_file_1(dir, path,
					 dir->untracked ? &dir->ss_info_exclude : NULL);
J
Junio C Hamano 已提交
2195
}
2196 2197 2198 2199 2200

int remove_path(const char *name)
{
	char *slash;

2201
	if (unlink(name) && errno != ENOENT && errno != ENOTDIR)
2202 2203 2204 2205 2206 2207 2208 2209
		return -1;

	slash = strrchr(name, '/');
	if (slash) {
		char *dirs = xstrdup(name);
		slash = dirs + (slash - name);
		do {
			*slash = '\0';
2210
		} while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
2211 2212 2213 2214 2215
		free(dirs);
	}
	return 0;
}

2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243
/*
 * Frees memory within dir which was allocated for exclude lists and
 * the exclude_stack.  Does not free dir itself.
 */
void clear_directory(struct dir_struct *dir)
{
	int i, j;
	struct exclude_list_group *group;
	struct exclude_list *el;
	struct exclude_stack *stk;

	for (i = EXC_CMDL; i <= EXC_FILE; i++) {
		group = &dir->exclude_list_group[i];
		for (j = 0; j < group->nr; j++) {
			el = &group->el[j];
			if (i == EXC_DIRS)
				free((char *)el->src);
			clear_exclude_list(el);
		}
		free(group->el);
	}

	stk = dir->exclude_stack;
	while (stk) {
		struct exclude_stack *prev = stk->prev;
		free(stk);
		stk = prev;
	}
2244
	strbuf_release(&dir->basebuf);
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 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346

struct ondisk_untracked_cache {
	struct stat_data info_exclude_stat;
	struct stat_data excludes_file_stat;
	uint32_t dir_flags;
	unsigned char info_exclude_sha1[20];
	unsigned char excludes_file_sha1[20];
	char exclude_per_dir[FLEX_ARRAY];
};

#define ouc_size(len) (offsetof(struct ondisk_untracked_cache, exclude_per_dir) + len + 1)

struct write_data {
	int index;	   /* number of written untracked_cache_dir */
	struct ewah_bitmap *check_only; /* from untracked_cache_dir */
	struct ewah_bitmap *valid;	/* from untracked_cache_dir */
	struct ewah_bitmap *sha1_valid; /* set if exclude_sha1 is not null */
	struct strbuf out;
	struct strbuf sb_stat;
	struct strbuf sb_sha1;
};

static void stat_data_to_disk(struct stat_data *to, const struct stat_data *from)
{
	to->sd_ctime.sec  = htonl(from->sd_ctime.sec);
	to->sd_ctime.nsec = htonl(from->sd_ctime.nsec);
	to->sd_mtime.sec  = htonl(from->sd_mtime.sec);
	to->sd_mtime.nsec = htonl(from->sd_mtime.nsec);
	to->sd_dev	  = htonl(from->sd_dev);
	to->sd_ino	  = htonl(from->sd_ino);
	to->sd_uid	  = htonl(from->sd_uid);
	to->sd_gid	  = htonl(from->sd_gid);
	to->sd_size	  = htonl(from->sd_size);
}

static void write_one_dir(struct untracked_cache_dir *untracked,
			  struct write_data *wd)
{
	struct stat_data stat_data;
	struct strbuf *out = &wd->out;
	unsigned char intbuf[16];
	unsigned int intlen, value;
	int i = wd->index++;

	/*
	 * untracked_nr should be reset whenever valid is clear, but
	 * for safety..
	 */
	if (!untracked->valid) {
		untracked->untracked_nr = 0;
		untracked->check_only = 0;
	}

	if (untracked->check_only)
		ewah_set(wd->check_only, i);
	if (untracked->valid) {
		ewah_set(wd->valid, i);
		stat_data_to_disk(&stat_data, &untracked->stat_data);
		strbuf_add(&wd->sb_stat, &stat_data, sizeof(stat_data));
	}
	if (!is_null_sha1(untracked->exclude_sha1)) {
		ewah_set(wd->sha1_valid, i);
		strbuf_add(&wd->sb_sha1, untracked->exclude_sha1, 20);
	}

	intlen = encode_varint(untracked->untracked_nr, intbuf);
	strbuf_add(out, intbuf, intlen);

	/* skip non-recurse directories */
	for (i = 0, value = 0; i < untracked->dirs_nr; i++)
		if (untracked->dirs[i]->recurse)
			value++;
	intlen = encode_varint(value, intbuf);
	strbuf_add(out, intbuf, intlen);

	strbuf_add(out, untracked->name, strlen(untracked->name) + 1);

	for (i = 0; i < untracked->untracked_nr; i++)
		strbuf_add(out, untracked->untracked[i],
			   strlen(untracked->untracked[i]) + 1);

	for (i = 0; i < untracked->dirs_nr; i++)
		if (untracked->dirs[i]->recurse)
			write_one_dir(untracked->dirs[i], wd);
}

void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked)
{
	struct ondisk_untracked_cache *ouc;
	struct write_data wd;
	unsigned char varbuf[16];
	int len = 0, varint_len;
	if (untracked->exclude_per_dir)
		len = strlen(untracked->exclude_per_dir);
	ouc = xmalloc(sizeof(*ouc) + len + 1);
	stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
	stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
	hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.sha1);
	hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.sha1);
	ouc->dir_flags = htonl(untracked->dir_flags);
	memcpy(ouc->exclude_per_dir, untracked->exclude_per_dir, len + 1);
2347 2348 2349 2350 2351

	varint_len = encode_varint(untracked->ident.len, varbuf);
	strbuf_add(out, varbuf, varint_len);
	strbuf_add(out, untracked->ident.buf, untracked->ident.len);

2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387
	strbuf_add(out, ouc, ouc_size(len));
	free(ouc);
	ouc = NULL;

	if (!untracked->root) {
		varint_len = encode_varint(0, varbuf);
		strbuf_add(out, varbuf, varint_len);
		return;
	}

	wd.index      = 0;
	wd.check_only = ewah_new();
	wd.valid      = ewah_new();
	wd.sha1_valid = ewah_new();
	strbuf_init(&wd.out, 1024);
	strbuf_init(&wd.sb_stat, 1024);
	strbuf_init(&wd.sb_sha1, 1024);
	write_one_dir(untracked->root, &wd);

	varint_len = encode_varint(wd.index, varbuf);
	strbuf_add(out, varbuf, varint_len);
	strbuf_addbuf(out, &wd.out);
	ewah_serialize_strbuf(wd.valid, out);
	ewah_serialize_strbuf(wd.check_only, out);
	ewah_serialize_strbuf(wd.sha1_valid, out);
	strbuf_addbuf(out, &wd.sb_stat);
	strbuf_addbuf(out, &wd.sb_sha1);
	strbuf_addch(out, '\0'); /* safe guard for string lists */

	ewah_free(wd.valid);
	ewah_free(wd.check_only);
	ewah_free(wd.sha1_valid);
	strbuf_release(&wd.out);
	strbuf_release(&wd.sb_stat);
	strbuf_release(&wd.sb_sha1);
}
2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450

static void free_untracked(struct untracked_cache_dir *ucd)
{
	int i;
	if (!ucd)
		return;
	for (i = 0; i < ucd->dirs_nr; i++)
		free_untracked(ucd->dirs[i]);
	for (i = 0; i < ucd->untracked_nr; i++)
		free(ucd->untracked[i]);
	free(ucd->untracked);
	free(ucd->dirs);
	free(ucd);
}

void free_untracked_cache(struct untracked_cache *uc)
{
	if (uc)
		free_untracked(uc->root);
	free(uc);
}

struct read_data {
	int index;
	struct untracked_cache_dir **ucd;
	struct ewah_bitmap *check_only;
	struct ewah_bitmap *valid;
	struct ewah_bitmap *sha1_valid;
	const unsigned char *data;
	const unsigned char *end;
};

static void stat_data_from_disk(struct stat_data *to, const struct stat_data *from)
{
	to->sd_ctime.sec  = get_be32(&from->sd_ctime.sec);
	to->sd_ctime.nsec = get_be32(&from->sd_ctime.nsec);
	to->sd_mtime.sec  = get_be32(&from->sd_mtime.sec);
	to->sd_mtime.nsec = get_be32(&from->sd_mtime.nsec);
	to->sd_dev	  = get_be32(&from->sd_dev);
	to->sd_ino	  = get_be32(&from->sd_ino);
	to->sd_uid	  = get_be32(&from->sd_uid);
	to->sd_gid	  = get_be32(&from->sd_gid);
	to->sd_size	  = get_be32(&from->sd_size);
}

static int read_one_dir(struct untracked_cache_dir **untracked_,
			struct read_data *rd)
{
	struct untracked_cache_dir ud, *untracked;
	const unsigned char *next, *data = rd->data, *end = rd->end;
	unsigned int value;
	int i, len;

	memset(&ud, 0, sizeof(ud));

	next = data;
	value = decode_varint(&next);
	if (next > end)
		return -1;
	ud.recurse	   = 1;
	ud.untracked_alloc = value;
	ud.untracked_nr	   = value;
	if (ud.untracked_nr)
J
Jeff King 已提交
2451
		ALLOC_ARRAY(ud.untracked, ud.untracked_nr);
2452 2453 2454 2455 2456 2457
	data = next;

	next = data;
	ud.dirs_alloc = ud.dirs_nr = decode_varint(&next);
	if (next > end)
		return -1;
J
Jeff King 已提交
2458
	ALLOC_ARRAY(ud.dirs, ud.dirs_nr);
2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536
	data = next;

	len = strlen((const char *)data);
	next = data + len + 1;
	if (next > rd->end)
		return -1;
	*untracked_ = untracked = xmalloc(sizeof(*untracked) + len);
	memcpy(untracked, &ud, sizeof(ud));
	memcpy(untracked->name, data, len + 1);
	data = next;

	for (i = 0; i < untracked->untracked_nr; i++) {
		len = strlen((const char *)data);
		next = data + len + 1;
		if (next > rd->end)
			return -1;
		untracked->untracked[i] = xstrdup((const char*)data);
		data = next;
	}

	rd->ucd[rd->index++] = untracked;
	rd->data = data;

	for (i = 0; i < untracked->dirs_nr; i++) {
		len = read_one_dir(untracked->dirs + i, rd);
		if (len < 0)
			return -1;
	}
	return 0;
}

static void set_check_only(size_t pos, void *cb)
{
	struct read_data *rd = cb;
	struct untracked_cache_dir *ud = rd->ucd[pos];
	ud->check_only = 1;
}

static void read_stat(size_t pos, void *cb)
{
	struct read_data *rd = cb;
	struct untracked_cache_dir *ud = rd->ucd[pos];
	if (rd->data + sizeof(struct stat_data) > rd->end) {
		rd->data = rd->end + 1;
		return;
	}
	stat_data_from_disk(&ud->stat_data, (struct stat_data *)rd->data);
	rd->data += sizeof(struct stat_data);
	ud->valid = 1;
}

static void read_sha1(size_t pos, void *cb)
{
	struct read_data *rd = cb;
	struct untracked_cache_dir *ud = rd->ucd[pos];
	if (rd->data + 20 > rd->end) {
		rd->data = rd->end + 1;
		return;
	}
	hashcpy(ud->exclude_sha1, rd->data);
	rd->data += 20;
}

static void load_sha1_stat(struct sha1_stat *sha1_stat,
			   const struct stat_data *stat,
			   const unsigned char *sha1)
{
	stat_data_from_disk(&sha1_stat->stat, stat);
	hashcpy(sha1_stat->sha1, sha1);
	sha1_stat->valid = 1;
}

struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz)
{
	const struct ondisk_untracked_cache *ouc;
	struct untracked_cache *uc;
	struct read_data rd;
	const unsigned char *next = data, *end = (const unsigned char *)data + sz;
2537 2538
	const char *ident;
	int ident_len, len;
2539 2540 2541 2542 2543

	if (sz <= 1 || end[-1] != '\0')
		return NULL;
	end--;

2544 2545 2546 2547 2548 2549
	ident_len = decode_varint(&next);
	if (next + ident_len > end)
		return NULL;
	ident = (const char *)next;
	next += ident_len;

2550 2551 2552 2553 2554
	ouc = (const struct ondisk_untracked_cache *)next;
	if (next + ouc_size(0) > end)
		return NULL;

	uc = xcalloc(1, sizeof(*uc));
2555 2556
	strbuf_init(&uc->ident, ident_len);
	strbuf_add(&uc->ident, ident, ident_len);
2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577
	load_sha1_stat(&uc->ss_info_exclude, &ouc->info_exclude_stat,
		       ouc->info_exclude_sha1);
	load_sha1_stat(&uc->ss_excludes_file, &ouc->excludes_file_stat,
		       ouc->excludes_file_sha1);
	uc->dir_flags = get_be32(&ouc->dir_flags);
	uc->exclude_per_dir = xstrdup(ouc->exclude_per_dir);
	/* NUL after exclude_per_dir is covered by sizeof(*ouc) */
	next += ouc_size(strlen(ouc->exclude_per_dir));
	if (next >= end)
		goto done2;

	len = decode_varint(&next);
	if (next > end || len == 0)
		goto done2;

	rd.valid      = ewah_new();
	rd.check_only = ewah_new();
	rd.sha1_valid = ewah_new();
	rd.data	      = next;
	rd.end	      = end;
	rd.index      = 0;
J
Jeff King 已提交
2578
	ALLOC_ARRAY(rd.ucd, len);
2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615

	if (read_one_dir(&uc->root, &rd) || rd.index != len)
		goto done;

	next = rd.data;
	len = ewah_read_mmap(rd.valid, next, end - next);
	if (len < 0)
		goto done;

	next += len;
	len = ewah_read_mmap(rd.check_only, next, end - next);
	if (len < 0)
		goto done;

	next += len;
	len = ewah_read_mmap(rd.sha1_valid, next, end - next);
	if (len < 0)
		goto done;

	ewah_each_bit(rd.check_only, set_check_only, &rd);
	rd.data = next + len;
	ewah_each_bit(rd.valid, read_stat, &rd);
	ewah_each_bit(rd.sha1_valid, read_sha1, &rd);
	next = rd.data;

done:
	free(rd.ucd);
	ewah_free(rd.valid);
	ewah_free(rd.check_only);
	ewah_free(rd.sha1_valid);
done2:
	if (next != end) {
		free_untracked_cache(uc);
		uc = NULL;
	}
	return uc;
}
2616

2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670
static void invalidate_one_directory(struct untracked_cache *uc,
				     struct untracked_cache_dir *ucd)
{
	uc->dir_invalidated++;
	ucd->valid = 0;
	ucd->untracked_nr = 0;
}

/*
 * Normally when an entry is added or removed from a directory,
 * invalidating that directory is enough. No need to touch its
 * ancestors. When a directory is shown as "foo/bar/" in git-status
 * however, deleting or adding an entry may have cascading effect.
 *
 * Say the "foo/bar/file" has become untracked, we need to tell the
 * untracked_cache_dir of "foo" that "bar/" is not an untracked
 * directory any more (because "bar" is managed by foo as an untracked
 * "file").
 *
 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
 * was the last untracked entry in the entire "foo", we should show
 * "foo/" instead. Which means we have to invalidate past "bar" up to
 * "foo".
 *
 * This function traverses all directories from root to leaf. If there
 * is a chance of one of the above cases happening, we invalidate back
 * to root. Otherwise we just invalidate the leaf. There may be a more
 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
 * detect these cases and avoid unnecessary invalidation, for example,
 * checking for the untracked entry named "bar/" in "foo", but for now
 * stick to something safe and simple.
 */
static int invalidate_one_component(struct untracked_cache *uc,
				    struct untracked_cache_dir *dir,
				    const char *path, int len)
{
	const char *rest = strchr(path, '/');

	if (rest) {
		int component_len = rest - path;
		struct untracked_cache_dir *d =
			lookup_untracked(uc, dir, path, component_len);
		int ret =
			invalidate_one_component(uc, d, rest + 1,
						 len - (component_len + 1));
		if (ret)
			invalidate_one_directory(uc, dir);
		return ret;
	}

	invalidate_one_directory(uc, dir);
	return uc->dir_flags & DIR_SHOW_OTHER_DIRECTORIES;
}

2671 2672 2673 2674 2675
void untracked_cache_invalidate_path(struct index_state *istate,
				     const char *path)
{
	if (!istate->untracked || !istate->untracked->root)
		return;
2676 2677
	invalidate_one_component(istate->untracked, istate->untracked->root,
				 path, strlen(path));
2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690
}

void untracked_cache_remove_from_index(struct index_state *istate,
				       const char *path)
{
	untracked_cache_invalidate_path(istate, path);
}

void untracked_cache_add_to_index(struct index_state *istate,
				  const char *path)
{
	untracked_cache_invalidate_path(istate, path);
}