Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 669 lines (589 sloc) 15.755 kb
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
1 #include "cache.h"
2 #include "tree-walk.h"
e6c111b4 » moy
2010-08-11 unpack_trees: group error messages by type
3 #include "unpack-trees.h"
bc96cc87 » pclouds
2010-12-15 tree_entry_interesting(): support depth limit
4 #include "dir.h"
8e440259 » Peter Eriksen
2006-04-02 Use blob_, commit_, tag_, and tree_type throughout.
5 #include "tree.h"
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
6
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
7 static const char *get_mode(const char *str, unsigned int *modep)
8 {
9 unsigned char c;
10 unsigned int mode = 0;
11
64cc1c09 » Martin Koegler
2008-01-06 tree-walk: don't parse incorrect entries
12 if (*str == ' ')
13 return NULL;
14
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
15 while ((c = *str++) != ' ') {
16 if (c < '0' || c > '7')
17 return NULL;
18 mode = (mode << 3) + (c - '0');
19 }
20 *modep = mode;
21 return str;
22 }
23
64cc1c09 » Martin Koegler
2008-01-06 tree-walk: don't parse incorrect entries
24 static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned long size)
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
25 {
26 const char *path;
27 unsigned int mode, len;
28
64cc1c09 » Martin Koegler
2008-01-06 tree-walk: don't parse incorrect entries
29 if (size < 24 || buf[size - 21])
30 die("corrupt tree file");
31
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
32 path = get_mode(buf, &mode);
64cc1c09 » Martin Koegler
2008-01-06 tree-walk: don't parse incorrect entries
33 if (!path || !*path)
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
34 die("corrupt tree file");
35 len = strlen(path) + 1;
36
37 /* Initialize the descriptor entry */
38 desc->entry.path = path;
39 desc->entry.mode = mode;
40 desc->entry.sha1 = (const unsigned char *)(path + len);
41 }
42
6fda5e51 » torvalds
2007-03-21 Initialize tree descriptors with a helper function rather than by hand.
43 void init_tree_desc(struct tree_desc *desc, const void *buffer, unsigned long size)
44 {
45 desc->buffer = buffer;
46 desc->size = size;
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
47 if (size)
48 decode_tree_entry(desc, buffer, size);
6fda5e51 » torvalds
2007-03-21 Initialize tree descriptors with a helper function rather than by hand.
49 }
50
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
51 void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
52 {
53 unsigned long size = 0;
54 void *buf = NULL;
55
56 if (sha1) {
8e440259 » Peter Eriksen
2006-04-02 Use blob_, commit_, tag_, and tree_type throughout.
57 buf = read_object_with_reference(sha1, tree_type, &size, NULL);
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
58 if (!buf)
59 die("unable to read tree %s", sha1_to_hex(sha1));
60 }
6fda5e51 » torvalds
2007-03-21 Initialize tree descriptors with a helper function rather than by hand.
61 init_tree_desc(desc, buf, size);
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
62 return buf;
63 }
64
65 static void entry_clear(struct name_entry *a)
66 {
67 memset(a, 0, sizeof(*a));
68 }
69
70 static void entry_extract(struct tree_desc *t, struct name_entry *a)
71 {
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
72 *a = t->entry;
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
73 }
74
75 void update_tree_entry(struct tree_desc *desc)
76 {
6fda5e51 » torvalds
2007-03-21 Initialize tree descriptors with a helper function rather than by hand.
77 const void *buf = desc->buffer;
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
78 const unsigned char *end = desc->entry.sha1 + 20;
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
79 unsigned long size = desc->size;
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
80 unsigned long len = end - (const unsigned char *)buf;
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
81
82 if (size < len)
83 die("corrupt tree file");
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
84 buf = end;
85 size -= len;
86 desc->buffer = buf;
87 desc->size = size;
88 if (size)
89 decode_tree_entry(desc, buf, size);
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
90 }
91
4c068a98 » Linus Torvalds
2006-05-30 tree_entry(): new tree-walking helper function
92 int tree_entry(struct tree_desc *desc, struct name_entry *entry)
93 {
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
94 if (!desc->size)
4c068a98 » Linus Torvalds
2006-05-30 tree_entry(): new tree-walking helper function
95 return 0;
96
4651ece8 » torvalds
2007-03-21 Switch over tree descriptors to contain a pre-parsed entry
97 *entry = desc->entry;
98 update_tree_entry(desc);
4c068a98 » Linus Torvalds
2006-05-30 tree_entry(): new tree-walking helper function
99 return 1;
100 }
101
40d934df » torvalds
2008-03-05 Make 'traverse_tree()' use linked structure rather than 'const char *…
102 void setup_traverse_info(struct traverse_info *info, const char *base)
103 {
104 int pathlen = strlen(base);
bcbe5a51 » torvalds
2008-03-06 Fix tree-walking compare_entry() in the presense of --prefix
105 static struct traverse_info dummy;
40d934df » torvalds
2008-03-05 Make 'traverse_tree()' use linked structure rather than 'const char *…
106
107 memset(info, 0, sizeof(*info));
108 if (pathlen && base[pathlen-1] == '/')
109 pathlen--;
110 info->pathlen = pathlen ? pathlen + 1 : 0;
111 info->name.path = base;
112 info->name.sha1 = (void *)(base + pathlen + 1);
bcbe5a51 » torvalds
2008-03-06 Fix tree-walking compare_entry() in the presense of --prefix
113 if (pathlen)
114 info->prev = &dummy;
40d934df » torvalds
2008-03-05 Make 'traverse_tree()' use linked structure rather than 'const char *…
115 }
116
117 char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n)
118 {
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
119 int len = tree_entry_len(n);
40d934df » torvalds
2008-03-05 Make 'traverse_tree()' use linked structure rather than 'const char *…
120 int pathlen = info->pathlen;
121
122 path[pathlen + len] = 0;
123 for (;;) {
124 memcpy(path + pathlen, n->path, len);
125 if (!pathlen)
126 break;
127 path[--pathlen] = '/';
128 n = &info->name;
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
129 len = tree_entry_len(n);
40d934df » torvalds
2008-03-05 Make 'traverse_tree()' use linked structure rather than 'const char *…
130 info = info->prev;
131 pathlen -= len;
132 }
133 return path;
134 }
135
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
136 struct tree_desc_skip {
137 struct tree_desc_skip *prev;
138 const void *ptr;
139 };
140
141 struct tree_desc_x {
142 struct tree_desc d;
143 struct tree_desc_skip *skip;
144 };
145
146 static int name_compare(const char *a, int a_len,
147 const char *b, int b_len)
148 {
149 int len = (a_len < b_len) ? a_len : b_len;
150 int cmp = memcmp(a, b, len);
151 if (cmp)
152 return cmp;
153 return (a_len - b_len);
154 }
155
156 static int check_entry_match(const char *a, int a_len, const char *b, int b_len)
157 {
158 /*
159 * The caller wants to pick *a* from a tree or nothing.
160 * We are looking at *b* in a tree.
161 *
162 * (0) If a and b are the same name, we are trivially happy.
163 *
164 * There are three possibilities where *a* could be hiding
165 * behind *b*.
166 *
167 * (1) *a* == "t", *b* == "ab" i.e. *b* sorts earlier than *a* no
168 * matter what.
169 * (2) *a* == "t", *b* == "t-2" and "t" is a subtree in the tree;
170 * (3) *a* == "t-2", *b* == "t" and "t-2" is a blob in the tree.
171 *
172 * Otherwise we know *a* won't appear in the tree without
173 * scanning further.
174 */
175
176 int cmp = name_compare(a, a_len, b, b_len);
177
178 /* Most common case first -- reading sync'd trees */
179 if (!cmp)
180 return cmp;
181
182 if (0 < cmp) {
183 /* a comes after b; it does not matter if it is case (3)
184 if (b_len < a_len && !memcmp(a, b, b_len) && a[b_len] < '/')
185 return 1;
186 */
187 return 1; /* keep looking */
188 }
189
190 /* b comes after a; are we looking at case (2)? */
191 if (a_len < b_len && !memcmp(a, b, a_len) && b[a_len] < '/')
192 return 1; /* keep looking */
193
194 return -1; /* a cannot appear in the tree */
195 }
196
197 /*
198 * From the extended tree_desc, extract the first name entry, while
199 * paying attention to the candidate "first" name. Most importantly,
200 * when looking for an entry, if there are entries that sorts earlier
201 * in the tree object representation than that name, skip them and
202 * process the named entry first. We will remember that we haven't
203 * processed the first entry yet, and in the later call skip the
204 * entry we processed early when update_extended_entry() is called.
205 *
206 * E.g. if the underlying tree object has these entries:
207 *
208 * blob "t-1"
209 * blob "t-2"
210 * tree "t"
211 * blob "t=1"
212 *
213 * and the "first" asks for "t", remember that we still need to
214 * process "t-1" and "t-2" but extract "t". After processing the
215 * entry "t" from this call, the caller will let us know by calling
216 * update_extended_entry() that we can remember "t" has been processed
217 * already.
218 */
219
220 static void extended_entry_extract(struct tree_desc_x *t,
221 struct name_entry *a,
222 const char *first,
223 int first_len)
224 {
225 const char *path;
226 int len;
227 struct tree_desc probe;
228 struct tree_desc_skip *skip;
229
230 /*
231 * Extract the first entry from the tree_desc, but skip the
232 * ones that we already returned in earlier rounds.
233 */
234 while (1) {
235 if (!t->d.size) {
236 entry_clear(a);
237 break; /* not found */
238 }
239 entry_extract(&t->d, a);
240 for (skip = t->skip; skip; skip = skip->prev)
241 if (a->path == skip->ptr)
242 break; /* found */
243 if (!skip)
244 break;
245 /* We have processed this entry already. */
246 update_tree_entry(&t->d);
247 }
248
249 if (!first || !a->path)
250 return;
251
252 /*
253 * The caller wants "first" from this tree, or nothing.
254 */
255 path = a->path;
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
256 len = tree_entry_len(a);
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
257 switch (check_entry_match(first, first_len, path, len)) {
258 case -1:
259 entry_clear(a);
260 case 0:
261 return;
262 default:
263 break;
264 }
265
266 /*
267 * We need to look-ahead -- we suspect that a subtree whose
268 * name is "first" may be hiding behind the current entry "path".
269 */
270 probe = t->d;
271 while (probe.size) {
272 entry_extract(&probe, a);
273 path = a->path;
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
274 len = tree_entry_len(a);
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
275 switch (check_entry_match(first, first_len, path, len)) {
276 case -1:
277 entry_clear(a);
278 case 0:
279 return;
280 default:
281 update_tree_entry(&probe);
282 break;
283 }
284 /* keep looking */
285 }
286 entry_clear(a);
287 }
288
289 static void update_extended_entry(struct tree_desc_x *t, struct name_entry *a)
290 {
291 if (t->d.entry.path == a->path) {
292 update_tree_entry(&t->d);
293 } else {
294 /* we have returned this entry early */
295 struct tree_desc_skip *skip = xmalloc(sizeof(*skip));
296 skip->ptr = a->path;
297 skip->prev = t->skip;
298 t->skip = skip;
299 }
300 }
301
302 static void free_extended_entry(struct tree_desc_x *t)
303 {
304 struct tree_desc_skip *p, *s;
305
306 for (s = t->skip; s; s = p) {
307 p = s->prev;
308 free(s);
309 }
310 }
311
2842c0f9 » gitster
2011-08-29 traverse_trees(): allow pruning with pathspec
312 static inline int prune_traversal(struct name_entry *e,
313 struct traverse_info *info,
314 struct strbuf *base,
315 int still_interesting)
316 {
317 if (!info->pathspec || still_interesting == 2)
318 return 2;
319 if (still_interesting < 0)
320 return still_interesting;
321 return tree_entry_interesting(e, base, 0, info->pathspec);
322 }
323
5803c6f8 » torvalds
2008-03-05 Add return value to 'traverse_tree()' callback
324 int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
325 {
5803c6f8 » torvalds
2008-03-05 Add return value to 'traverse_tree()' callback
326 int ret = 0;
e6c111b4 » moy
2010-08-11 unpack_trees: group error messages by type
327 int error = 0;
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
328 struct name_entry *entry = xmalloc(n*sizeof(*entry));
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
329 int i;
330 struct tree_desc_x *tx = xcalloc(n, sizeof(*tx));
2842c0f9 » gitster
2011-08-29 traverse_trees(): allow pruning with pathspec
331 struct strbuf base = STRBUF_INIT;
332 int interesting = 1;
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
333
334 for (i = 0; i < n; i++)
335 tx[i].d = t[i];
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
336
2842c0f9 » gitster
2011-08-29 traverse_trees(): allow pruning with pathspec
337 if (info->prev) {
338 strbuf_grow(&base, info->pathlen);
339 make_traverse_path(base.buf, info->prev, &info->name);
340 base.buf[info->pathlen-1] = '/';
341 strbuf_setlen(&base, info->pathlen);
342 }
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
343 for (;;) {
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
344 unsigned long mask, dirmask;
345 const char *first = NULL;
346 int first_len = 0;
27c0f768 » Ramsay Jones
2011-09-11 Fix some "variable might be used uninitialized" warnings
347 struct name_entry *e = NULL;
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
348 int len;
349
350 for (i = 0; i < n; i++) {
351 e = entry + i;
352 extended_entry_extract(tx + i, e, NULL, 0);
353 }
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
354
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
355 /*
356 * A tree may have "t-2" at the current location even
357 * though it may have "t" that is a subtree behind it,
358 * and another tree may return "t". We want to grab
359 * all "t" from all trees to match in such a case.
360 */
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
361 for (i = 0; i < n; i++) {
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
362 e = entry + i;
363 if (!e->path)
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
364 continue;
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
365 len = tree_entry_len(e);
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
366 if (!first) {
367 first = e->path;
368 first_len = len;
369 continue;
370 }
371 if (name_compare(e->path, len, first, first_len) < 0) {
372 first = e->path;
373 first_len = len;
374 }
375 }
376
377 if (first) {
378 for (i = 0; i < n; i++) {
379 e = entry + i;
380 extended_entry_extract(tx + i, e, first, first_len);
381 /* Cull the ones that are not the earliest */
382 if (!e->path)
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
383 continue;
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
384 len = tree_entry_len(e);
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
385 if (name_compare(e->path, len, first, first_len))
386 entry_clear(e);
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
387 }
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
388 }
389
390 /* Now we have in entry[i] the earliest name from the trees */
391 mask = 0;
392 dirmask = 0;
393 for (i = 0; i < n; i++) {
394 if (!entry[i].path)
395 continue;
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
396 mask |= 1ul << i;
91e4f036 » torvalds
2008-03-05 Make 'traverse_trees()' traverse conflicting DF entries in parallel
397 if (S_ISDIR(entry[i].mode))
398 dirmask |= 1ul << i;
2842c0f9 » gitster
2011-08-29 traverse_trees(): allow pruning with pathspec
399 e = &entry[i];
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
400 }
401 if (!mask)
402 break;
2842c0f9 » gitster
2011-08-29 traverse_trees(): allow pruning with pathspec
403 interesting = prune_traversal(e, info, &base, interesting);
404 if (interesting < 0)
405 break;
406 if (interesting) {
407 ret = info->fn(n, mask, dirmask, entry, info);
408 if (ret < 0) {
409 error = ret;
410 if (!info->show_all_errors)
411 break;
412 }
413 mask &= ret;
e6c111b4 » moy
2010-08-11 unpack_trees: group error messages by type
414 }
5803c6f8 » torvalds
2008-03-05 Add return value to 'traverse_tree()' callback
415 ret = 0;
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
416 for (i = 0; i < n; i++)
5803c6f8 » torvalds
2008-03-05 Add return value to 'traverse_tree()' callback
417 if (mask & (1ul << i))
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
418 update_extended_entry(tx + i, entry + i);
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
419 }
420 free(entry);
1ee26571 » gitster
2009-09-19 traverse_trees(): handle D/F conflict case sanely
421 for (i = 0; i < n; i++)
422 free_extended_entry(tx + i);
423 free(tx);
2842c0f9 » gitster
2011-08-29 traverse_trees(): allow pruning with pathspec
424 strbuf_release(&base);
e6c111b4 » moy
2010-08-11 unpack_trees: group error messages by type
425 return error;
1b0c7174 » Junio C Hamano
2006-03-29 tree/diff header cleanup.
426 }
427
4dcff634 » Junio C Hamano
2006-04-19 get_tree_entry(): make it available from tree-walk
428 static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result, unsigned *mode)
429 {
430 int namelen = strlen(name);
431 while (t->size) {
432 const char *entry;
433 const unsigned char *sha1;
434 int entrylen, cmp;
435
436 sha1 = tree_entry_extract(t, &entry, mode);
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
437 entrylen = tree_entry_len(&t->entry);
4dcff634 » Junio C Hamano
2006-04-19 get_tree_entry(): make it available from tree-walk
438 update_tree_entry(t);
439 if (entrylen > namelen)
440 continue;
441 cmp = memcmp(name, entry, entrylen);
442 if (cmp > 0)
443 continue;
444 if (cmp < 0)
445 break;
446 if (entrylen == namelen) {
e702496e » spearce
2006-08-23 Convert memcpy(a,b,20) to hashcpy(a,b).
447 hashcpy(result, sha1);
4dcff634 » Junio C Hamano
2006-04-19 get_tree_entry(): make it available from tree-walk
448 return 0;
449 }
450 if (name[entrylen] != '/')
451 continue;
452 if (!S_ISDIR(*mode))
453 break;
454 if (++entrylen == namelen) {
e702496e » spearce
2006-08-23 Convert memcpy(a,b,20) to hashcpy(a,b).
455 hashcpy(result, sha1);
4dcff634 » Junio C Hamano
2006-04-19 get_tree_entry(): make it available from tree-walk
456 return 0;
457 }
458 return get_tree_entry(sha1, name + entrylen, result, mode);
459 }
460 return -1;
461 }
462
463 int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned char *sha1, unsigned *mode)
464 {
465 int retval;
466 void *tree;
6fda5e51 » torvalds
2007-03-21 Initialize tree descriptors with a helper function rather than by hand.
467 unsigned long size;
d93b7d1c » peff
2007-01-09 get_tree_entry: map blank requested entry to tree root
468 unsigned char root[20];
4dcff634 » Junio C Hamano
2006-04-19 get_tree_entry(): make it available from tree-walk
469
6fda5e51 » torvalds
2007-03-21 Initialize tree descriptors with a helper function rather than by hand.
470 tree = read_object_with_reference(tree_sha1, tree_type, &size, root);
4dcff634 » Junio C Hamano
2006-04-19 get_tree_entry(): make it available from tree-walk
471 if (!tree)
472 return -1;
d93b7d1c » peff
2007-01-09 get_tree_entry: map blank requested entry to tree root
473
474 if (name[0] == '\0') {
475 hashcpy(sha1, root);
ef006503 » René Scharfe
2010-02-14 fix minor memory leak in get_tree_entry()
476 free(tree);
d93b7d1c » peff
2007-01-09 get_tree_entry: map blank requested entry to tree root
477 return 0;
478 }
479
5fb8c05f » gitster
2011-10-27 get_tree_entry(): do not call find_tree_entry() on an empty tree
480 if (!size) {
481 retval = -1;
482 } else {
483 struct tree_desc t;
484 init_tree_desc(&t, tree, size);
485 retval = find_tree_entry(&t, name, sha1, mode);
486 }
4dcff634 » Junio C Hamano
2006-04-19 get_tree_entry(): make it available from tree-walk
487 free(tree);
488 return retval;
489 }
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
490
58c4d666 » pclouds
2010-12-15 tree_entry_interesting(): refactor into separate smaller functions
491 static int match_entry(const struct name_entry *entry, int pathlen,
492 const char *match, int matchlen,
493 int *never_interesting)
494 {
495 int m = -1; /* signals that we haven't called strncmp() */
496
497 if (*never_interesting) {
498 /*
499 * We have not seen any match that sorts later
500 * than the current path.
501 */
502
503 /*
504 * Does match sort strictly earlier than path
505 * with their common parts?
506 */
507 m = strncmp(match, entry->path,
508 (matchlen < pathlen) ? matchlen : pathlen);
509 if (m < 0)
510 return 0;
511
512 /*
513 * If we come here even once, that means there is at
514 * least one pathspec that would sort equal to or
515 * later than the path we are currently looking at.
516 * In other words, if we have never reached this point
517 * after iterating all pathspecs, it means all
518 * pathspecs are either outside of base, or inside the
519 * base but sorts strictly earlier than the current
520 * one. In either case, they will never match the
521 * subsequent entries. In such a case, we initialized
522 * the variable to -1 and that is what will be
523 * returned, allowing the caller to terminate early.
524 */
525 *never_interesting = 0;
526 }
527
528 if (pathlen > matchlen)
529 return 0;
530
531 if (matchlen > pathlen) {
532 if (match[pathlen] != '/')
533 return 0;
534 if (!S_ISDIR(entry->mode))
535 return 0;
536 }
537
538 if (m == -1)
539 /*
540 * we cheated and did not do strncmp(), so we do
541 * that here.
542 */
543 m = strncmp(match, entry->path, pathlen);
544
545 /*
546 * If common part matched earlier then it is a hit,
547 * because we rejected the case where path is not a
548 * leading directory and is shorter than match.
549 */
550 if (!m)
551 return 1;
552
553 return 0;
554 }
555
6de96915 » toofishes
2011-09-08 tree-walk: drop unused parameter from match_dir_prefix
556 static int match_dir_prefix(const char *base,
58c4d666 » pclouds
2010-12-15 tree_entry_interesting(): refactor into separate smaller functions
557 const char *match, int matchlen)
558 {
559 if (strncmp(base, match, matchlen))
560 return 0;
561
562 /*
563 * If the base is a subdirectory of a path which
564 * was specified, all of them are interesting.
565 */
566 if (!matchlen ||
567 base[matchlen] == '/' ||
568 match[matchlen - 1] == '/')
569 return 1;
570
571 /* Just a random prefix match */
572 return 0;
573 }
574
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
575 /*
576 * Is a tree entry interesting given the pathspec we have?
577 *
1376e507 » pclouds
2010-12-17 grep: drop pathspec_matches() in favor of tree_entry_interesting()
578 * Pre-condition: either baselen == base_offset (i.e. empty path)
579 * or base[baselen-1] == '/' (i.e. with trailing slash).
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
580 */
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
581 enum interesting tree_entry_interesting(const struct name_entry *entry,
582 struct strbuf *base, int base_offset,
583 const struct pathspec *ps)
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
584 {
585 int i;
1376e507 » pclouds
2010-12-17 grep: drop pathspec_matches() in favor of tree_entry_interesting()
586 int pathlen, baselen = base->len - base_offset;
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
587 int never_interesting = ps->has_wildcard ?
588 entry_not_interesting : all_entries_not_interesting;
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
589
bc96cc87 » pclouds
2010-12-15 tree_entry_interesting(): support depth limit
590 if (!ps->nr) {
591 if (!ps->recursive || ps->max_depth == -1)
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
592 return all_entries_interesting;
593 return within_depth(base->buf + base_offset, baselen,
594 !!S_ISDIR(entry->mode),
595 ps->max_depth) ?
596 entry_interesting : entry_not_interesting;
bc96cc87 » pclouds
2010-12-15 tree_entry_interesting(): support depth limit
597 }
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
598
0de16337 » pclouds
2011-10-24 tree-walk.c: do not leak internal structure in tree_entry_len()
599 pathlen = tree_entry_len(entry);
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
600
1376e507 » pclouds
2010-12-17 grep: drop pathspec_matches() in favor of tree_entry_interesting()
601 for (i = ps->nr - 1; i >= 0; i--) {
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
602 const struct pathspec_item *item = ps->items+i;
603 const char *match = item->match;
1376e507 » pclouds
2010-12-17 grep: drop pathspec_matches() in favor of tree_entry_interesting()
604 const char *base_str = base->buf + base_offset;
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
605 int matchlen = item->len;
606
607 if (baselen >= matchlen) {
608 /* If it doesn't match, move along... */
6de96915 » toofishes
2011-09-08 tree-walk: drop unused parameter from match_dir_prefix
609 if (!match_dir_prefix(base_str, match, matchlen))
d38f2809 » pclouds
2010-12-15 tree_entry_interesting(): support wildcard matching
610 goto match_wildcards;
bc96cc87 » pclouds
2010-12-15 tree_entry_interesting(): support depth limit
611
612 if (!ps->recursive || ps->max_depth == -1)
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
613 return all_entries_interesting;
bc96cc87 » pclouds
2010-12-15 tree_entry_interesting(): support depth limit
614
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
615 return within_depth(base_str + matchlen + 1,
616 baselen - matchlen - 1,
617 !!S_ISDIR(entry->mode),
618 ps->max_depth) ?
619 entry_interesting : entry_not_interesting;
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
620 }
621
1b740923 » toofishes
2011-09-08 tree-walk: micro-optimization in tree_entry_interesting
622 /* Either there must be no base, or the base must match. */
623 if (baselen == 0 || !strncmp(base_str, match, baselen)) {
58c4d666 » pclouds
2010-12-15 tree_entry_interesting(): refactor into separate smaller functions
624 if (match_entry(entry, pathlen,
625 match + baselen, matchlen - baselen,
626 &never_interesting))
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
627 return entry_interesting;
f1a2ddbb » pclouds
2010-12-15 tree_entry_interesting(): optimize wildcard matching when base is mat…
628
9c6bebd1 » pclouds
2011-10-24 tree_entry_interesting: make use of local pointer "item"
629 if (item->use_wildcard) {
f1a2ddbb » pclouds
2010-12-15 tree_entry_interesting(): optimize wildcard matching when base is mat…
630 if (!fnmatch(match + baselen, entry->path, 0))
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
631 return entry_interesting;
f1a2ddbb » pclouds
2010-12-15 tree_entry_interesting(): optimize wildcard matching when base is mat…
632
633 /*
634 * Match all directories. We'll try to
635 * match files later on.
636 */
637 if (ps->recursive && S_ISDIR(entry->mode))
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
638 return entry_interesting;
f1a2ddbb » pclouds
2010-12-15 tree_entry_interesting(): optimize wildcard matching when base is mat…
639 }
640
641 continue;
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
642 }
d38f2809 » pclouds
2010-12-15 tree_entry_interesting(): support wildcard matching
643
644 match_wildcards:
9c6bebd1 » pclouds
2011-10-24 tree_entry_interesting: make use of local pointer "item"
645 if (!item->use_wildcard)
d38f2809 » pclouds
2010-12-15 tree_entry_interesting(): support wildcard matching
646 continue;
647
648 /*
649 * Concatenate base and entry->path into one and do
650 * fnmatch() on it.
651 */
652
653 strbuf_add(base, entry->path, pathlen);
654
1376e507 » pclouds
2010-12-17 grep: drop pathspec_matches() in favor of tree_entry_interesting()
655 if (!fnmatch(match, base->buf + base_offset, 0)) {
656 strbuf_setlen(base, base_offset + baselen);
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
657 return entry_interesting;
d38f2809 » pclouds
2010-12-15 tree_entry_interesting(): support wildcard matching
658 }
1376e507 » pclouds
2010-12-17 grep: drop pathspec_matches() in favor of tree_entry_interesting()
659 strbuf_setlen(base, base_offset + baselen);
d38f2809 » pclouds
2010-12-15 tree_entry_interesting(): support wildcard matching
660
661 /*
662 * Match all directories. We'll try to match files
663 * later on.
664 */
665 if (ps->recursive && S_ISDIR(entry->mode))
d688cf07 » pclouds
2011-10-24 tree_entry_interesting(): give meaningful names to return values
666 return entry_interesting;
2c389fc8 » pclouds
2010-12-15 Move tree_entry_interesting() to tree-walk.c and export it
667 }
668 return never_interesting; /* No matches */
669 }
Something went wrong with that request. Please try again.