]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
4aab5b46 | 6 | #define NO_THE_INDEX_COMPATIBILITY_MACROS |
e83c5163 | 7 | #include "cache.h" |
bad68ec9 | 8 | #include "cache-tree.h" |
f35a6d3b | 9 | #include "refs.h" |
d616813d | 10 | #include "dir.h" |
bad68ec9 JH |
11 | |
12 | /* Index extensions. | |
13 | * | |
14 | * The first letter should be 'A'..'Z' for extensions that are not | |
15 | * necessary for a correct operation (i.e. optimization data). | |
16 | * When new extensions are added that _needs_ to be understood in | |
17 | * order to correctly interpret the index file, pick character that | |
18 | * is outside the range, to cause the reader to abort. | |
19 | */ | |
20 | ||
21 | #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) | |
22 | #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ | |
e83c5163 | 23 | |
228e94f9 | 24 | struct index_state the_index; |
8fd2cb40 | 25 | |
415e96c8 JH |
26 | /* |
27 | * This only updates the "non-critical" parts of the directory | |
28 | * cache, ie the parts that aren't tracked by GIT, and only used | |
29 | * to validate the cache. | |
30 | */ | |
31 | void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) | |
32 | { | |
33 | ce->ce_ctime.sec = htonl(st->st_ctime); | |
34 | ce->ce_mtime.sec = htonl(st->st_mtime); | |
2cb45e95 | 35 | #ifdef USE_NSEC |
415e96c8 JH |
36 | ce->ce_ctime.nsec = htonl(st->st_ctim.tv_nsec); |
37 | ce->ce_mtime.nsec = htonl(st->st_mtim.tv_nsec); | |
38 | #endif | |
39 | ce->ce_dev = htonl(st->st_dev); | |
40 | ce->ce_ino = htonl(st->st_ino); | |
41 | ce->ce_uid = htonl(st->st_uid); | |
42 | ce->ce_gid = htonl(st->st_gid); | |
43 | ce->ce_size = htonl(st->st_size); | |
5f73076c JH |
44 | |
45 | if (assume_unchanged) | |
46 | ce->ce_flags |= htons(CE_VALID); | |
415e96c8 JH |
47 | } |
48 | ||
29e4d363 JH |
49 | static int ce_compare_data(struct cache_entry *ce, struct stat *st) |
50 | { | |
51 | int match = -1; | |
52 | int fd = open(ce->name, O_RDONLY); | |
53 | ||
54 | if (fd >= 0) { | |
55 | unsigned char sha1[20]; | |
53bca91a | 56 | if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name)) |
a89fccd2 | 57 | match = hashcmp(sha1, ce->sha1); |
7f8508e8 | 58 | /* index_fd() closed the file descriptor already */ |
29e4d363 JH |
59 | } |
60 | return match; | |
61 | } | |
62 | ||
dc49cd76 | 63 | static int ce_compare_link(struct cache_entry *ce, size_t expected_size) |
29e4d363 JH |
64 | { |
65 | int match = -1; | |
66 | char *target; | |
67 | void *buffer; | |
68 | unsigned long size; | |
21666f1a | 69 | enum object_type type; |
29e4d363 JH |
70 | int len; |
71 | ||
72 | target = xmalloc(expected_size); | |
73 | len = readlink(ce->name, target, expected_size); | |
74 | if (len != expected_size) { | |
75 | free(target); | |
76 | return -1; | |
77 | } | |
21666f1a | 78 | buffer = read_sha1_file(ce->sha1, &type, &size); |
29e4d363 JH |
79 | if (!buffer) { |
80 | free(target); | |
81 | return -1; | |
82 | } | |
83 | if (size == expected_size) | |
84 | match = memcmp(buffer, target, size); | |
85 | free(buffer); | |
86 | free(target); | |
87 | return match; | |
88 | } | |
89 | ||
f35a6d3b LT |
90 | static int ce_compare_gitlink(struct cache_entry *ce) |
91 | { | |
92 | unsigned char sha1[20]; | |
93 | ||
94 | /* | |
95 | * We don't actually require that the .git directory | |
302b9282 | 96 | * under GITLINK directory be a valid git directory. It |
f35a6d3b LT |
97 | * might even be missing (in case nobody populated that |
98 | * sub-project). | |
99 | * | |
100 | * If so, we consider it always to match. | |
101 | */ | |
102 | if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0) | |
103 | return 0; | |
104 | return hashcmp(sha1, ce->sha1); | |
105 | } | |
106 | ||
29e4d363 JH |
107 | static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st) |
108 | { | |
109 | switch (st->st_mode & S_IFMT) { | |
110 | case S_IFREG: | |
111 | if (ce_compare_data(ce, st)) | |
112 | return DATA_CHANGED; | |
113 | break; | |
114 | case S_IFLNK: | |
dc49cd76 | 115 | if (ce_compare_link(ce, xsize_t(st->st_size))) |
29e4d363 JH |
116 | return DATA_CHANGED; |
117 | break; | |
a8ee75bc | 118 | case S_IFDIR: |
302b9282 | 119 | if (S_ISGITLINK(ntohl(ce->ce_mode))) |
a8ee75bc | 120 | return 0; |
29e4d363 JH |
121 | default: |
122 | return TYPE_CHANGED; | |
123 | } | |
124 | return 0; | |
125 | } | |
126 | ||
407c8eb0 | 127 | static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) |
734aab75 LT |
128 | { |
129 | unsigned int changed = 0; | |
130 | ||
8ae0a8c5 KS |
131 | switch (ntohl(ce->ce_mode) & S_IFMT) { |
132 | case S_IFREG: | |
133 | changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0; | |
3e09cdfd JH |
134 | /* We consider only the owner x bit to be relevant for |
135 | * "mode changes" | |
136 | */ | |
137 | if (trust_executable_bit && | |
138 | (0100 & (ntohl(ce->ce_mode) ^ st->st_mode))) | |
ffbe1add | 139 | changed |= MODE_CHANGED; |
8ae0a8c5 KS |
140 | break; |
141 | case S_IFLNK: | |
78a8d641 JS |
142 | if (!S_ISLNK(st->st_mode) && |
143 | (has_symlinks || !S_ISREG(st->st_mode))) | |
144 | changed |= TYPE_CHANGED; | |
8ae0a8c5 | 145 | break; |
302b9282 | 146 | case S_IFGITLINK: |
f35a6d3b LT |
147 | if (!S_ISDIR(st->st_mode)) |
148 | changed |= TYPE_CHANGED; | |
149 | else if (ce_compare_gitlink(ce)) | |
150 | changed |= DATA_CHANGED; | |
a8ee75bc | 151 | return changed; |
cd8ae201 LT |
152 | case 0: /* Special case: unmerged file in index */ |
153 | return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; | |
8ae0a8c5 KS |
154 | default: |
155 | die("internal error: ce_mode is %o", ntohl(ce->ce_mode)); | |
156 | } | |
ccc4feb5 | 157 | if (ce->ce_mtime.sec != htonl(st->st_mtime)) |
734aab75 | 158 | changed |= MTIME_CHANGED; |
ccc4feb5 LT |
159 | if (ce->ce_ctime.sec != htonl(st->st_ctime)) |
160 | changed |= CTIME_CHANGED; | |
161 | ||
2cb45e95 | 162 | #ifdef USE_NSEC |
ccc4feb5 LT |
163 | /* |
164 | * nsec seems unreliable - not all filesystems support it, so | |
165 | * as long as it is in the inode cache you get right nsec | |
166 | * but after it gets flushed, you get zero nsec. | |
167 | */ | |
94dfb7f2 | 168 | if (ce->ce_mtime.nsec != htonl(st->st_mtim.tv_nsec)) |
ccc4feb5 | 169 | changed |= MTIME_CHANGED; |
94dfb7f2 | 170 | if (ce->ce_ctime.nsec != htonl(st->st_ctim.tv_nsec)) |
734aab75 | 171 | changed |= CTIME_CHANGED; |
a6080a0a | 172 | #endif |
ccc4feb5 LT |
173 | |
174 | if (ce->ce_uid != htonl(st->st_uid) || | |
175 | ce->ce_gid != htonl(st->st_gid)) | |
734aab75 | 176 | changed |= OWNER_CHANGED; |
2cb45e95 | 177 | if (ce->ce_ino != htonl(st->st_ino)) |
734aab75 | 178 | changed |= INODE_CHANGED; |
2cb45e95 LT |
179 | |
180 | #ifdef USE_STDEV | |
181 | /* | |
182 | * st_dev breaks on network filesystems where different | |
183 | * clients will have different views of what "device" | |
184 | * the filesystem is on | |
185 | */ | |
186 | if (ce->ce_dev != htonl(st->st_dev)) | |
187 | changed |= INODE_CHANGED; | |
188 | #endif | |
189 | ||
ccc4feb5 | 190 | if (ce->ce_size != htonl(st->st_size)) |
734aab75 | 191 | changed |= DATA_CHANGED; |
b0391890 | 192 | |
407c8eb0 JH |
193 | return changed; |
194 | } | |
195 | ||
4aab5b46 | 196 | int ie_match_stat(struct index_state *istate, |
4bd5b7da JH |
197 | struct cache_entry *ce, struct stat *st, |
198 | unsigned int options) | |
407c8eb0 | 199 | { |
5f73076c | 200 | unsigned int changed; |
4bd5b7da JH |
201 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; |
202 | int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; | |
5f73076c JH |
203 | |
204 | /* | |
205 | * If it's marked as always valid in the index, it's | |
206 | * valid whatever the checked-out copy says. | |
207 | */ | |
208 | if (!ignore_valid && (ce->ce_flags & htons(CE_VALID))) | |
209 | return 0; | |
210 | ||
211 | changed = ce_match_stat_basic(ce, st); | |
407c8eb0 | 212 | |
29e4d363 JH |
213 | /* |
214 | * Within 1 second of this sequence: | |
215 | * echo xyzzy >file && git-update-index --add file | |
216 | * running this command: | |
217 | * echo frotz >file | |
218 | * would give a falsely clean cache entry. The mtime and | |
219 | * length match the cache, and other stat fields do not change. | |
220 | * | |
221 | * We could detect this at update-index time (the cache entry | |
222 | * being registered/updated records the same time as "now") | |
223 | * and delay the return from git-update-index, but that would | |
224 | * effectively mean we can make at most one commit per second, | |
225 | * which is not acceptable. Instead, we check cache entries | |
226 | * whose mtime are the same as the index file timestamp more | |
5f73076c | 227 | * carefully than others. |
29e4d363 JH |
228 | */ |
229 | if (!changed && | |
4aab5b46 JH |
230 | istate->timestamp && |
231 | istate->timestamp <= ntohl(ce->ce_mtime.sec)) { | |
42f77406 JH |
232 | if (assume_racy_is_modified) |
233 | changed |= DATA_CHANGED; | |
234 | else | |
235 | changed |= ce_modified_check_fs(ce, st); | |
236 | } | |
b0391890 | 237 | |
29e4d363 | 238 | return changed; |
b0391890 JH |
239 | } |
240 | ||
4aab5b46 | 241 | int ie_modified(struct index_state *istate, |
4bd5b7da | 242 | struct cache_entry *ce, struct stat *st, unsigned int options) |
b0391890 | 243 | { |
29e4d363 | 244 | int changed, changed_fs; |
4bd5b7da JH |
245 | |
246 | changed = ie_match_stat(istate, ce, st, options); | |
b0391890 JH |
247 | if (!changed) |
248 | return 0; | |
b0391890 JH |
249 | /* |
250 | * If the mode or type has changed, there's no point in trying | |
251 | * to refresh the entry - it's not going to match | |
252 | */ | |
253 | if (changed & (MODE_CHANGED | TYPE_CHANGED)) | |
254 | return changed; | |
255 | ||
256 | /* Immediately after read-tree or update-index --cacheinfo, | |
257 | * the length field is zero. For other cases the ce_size | |
258 | * should match the SHA1 recorded in the index entry. | |
259 | */ | |
260 | if ((changed & DATA_CHANGED) && ce->ce_size != htonl(0)) | |
261 | return changed; | |
262 | ||
29e4d363 JH |
263 | changed_fs = ce_modified_check_fs(ce, st); |
264 | if (changed_fs) | |
265 | return changed | changed_fs; | |
b0391890 JH |
266 | return 0; |
267 | } | |
268 | ||
958ba6c9 LT |
269 | int base_name_compare(const char *name1, int len1, int mode1, |
270 | const char *name2, int len2, int mode2) | |
271 | { | |
272 | unsigned char c1, c2; | |
273 | int len = len1 < len2 ? len1 : len2; | |
274 | int cmp; | |
275 | ||
276 | cmp = memcmp(name1, name2, len); | |
277 | if (cmp) | |
278 | return cmp; | |
279 | c1 = name1[len]; | |
280 | c2 = name2[len]; | |
1833a925 | 281 | if (!c1 && S_ISDIR(mode1)) |
958ba6c9 | 282 | c1 = '/'; |
1833a925 | 283 | if (!c2 && S_ISDIR(mode2)) |
958ba6c9 LT |
284 | c2 = '/'; |
285 | return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; | |
286 | } | |
287 | ||
95fd5bf8 | 288 | int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2) |
eb38c22f | 289 | { |
95fd5bf8 LT |
290 | int len1 = flags1 & CE_NAMEMASK; |
291 | int len2 = flags2 & CE_NAMEMASK; | |
eb38c22f LT |
292 | int len = len1 < len2 ? len1 : len2; |
293 | int cmp; | |
294 | ||
295 | cmp = memcmp(name1, name2, len); | |
296 | if (cmp) | |
297 | return cmp; | |
298 | if (len1 < len2) | |
299 | return -1; | |
300 | if (len1 > len2) | |
301 | return 1; | |
5f73076c | 302 | |
7b80be15 JH |
303 | /* Compare stages */ |
304 | flags1 &= CE_STAGEMASK; | |
305 | flags2 &= CE_STAGEMASK; | |
5f73076c | 306 | |
95fd5bf8 LT |
307 | if (flags1 < flags2) |
308 | return -1; | |
309 | if (flags1 > flags2) | |
310 | return 1; | |
eb38c22f LT |
311 | return 0; |
312 | } | |
313 | ||
4aab5b46 | 314 | int index_name_pos(struct index_state *istate, const char *name, int namelen) |
eb38c22f LT |
315 | { |
316 | int first, last; | |
317 | ||
318 | first = 0; | |
4aab5b46 | 319 | last = istate->cache_nr; |
eb38c22f LT |
320 | while (last > first) { |
321 | int next = (last + first) >> 1; | |
4aab5b46 | 322 | struct cache_entry *ce = istate->cache[next]; |
972d1bb0 | 323 | int cmp = cache_name_compare(name, namelen, ce->name, ntohs(ce->ce_flags)); |
eb38c22f | 324 | if (!cmp) |
76e7f4ec | 325 | return next; |
eb38c22f LT |
326 | if (cmp < 0) { |
327 | last = next; | |
328 | continue; | |
329 | } | |
330 | first = next+1; | |
331 | } | |
76e7f4ec | 332 | return -first-1; |
eb38c22f LT |
333 | } |
334 | ||
7b937ca3 | 335 | /* Remove entry, return true if there are more entries to go.. */ |
4aab5b46 | 336 | int remove_index_entry_at(struct index_state *istate, int pos) |
7b937ca3 | 337 | { |
4aab5b46 JH |
338 | istate->cache_changed = 1; |
339 | istate->cache_nr--; | |
340 | if (pos >= istate->cache_nr) | |
7b937ca3 | 341 | return 0; |
4aab5b46 JH |
342 | memmove(istate->cache + pos, |
343 | istate->cache + pos + 1, | |
344 | (istate->cache_nr - pos) * sizeof(struct cache_entry *)); | |
7b937ca3 LT |
345 | return 1; |
346 | } | |
347 | ||
4aab5b46 | 348 | int remove_file_from_index(struct index_state *istate, const char *path) |
197ee8c9 | 349 | { |
4aab5b46 | 350 | int pos = index_name_pos(istate, path, strlen(path)); |
c4e3cca1 JH |
351 | if (pos < 0) |
352 | pos = -pos-1; | |
09d5dc32 | 353 | cache_tree_invalidate_path(istate->cache_tree, path); |
4aab5b46 JH |
354 | while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) |
355 | remove_index_entry_at(istate, pos); | |
197ee8c9 LT |
356 | return 0; |
357 | } | |
358 | ||
20314271 JS |
359 | static int compare_name(struct cache_entry *ce, const char *path, int namelen) |
360 | { | |
361 | return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen); | |
362 | } | |
363 | ||
364 | static int index_name_pos_also_unmerged(struct index_state *istate, | |
365 | const char *path, int namelen) | |
366 | { | |
367 | int pos = index_name_pos(istate, path, namelen); | |
368 | struct cache_entry *ce; | |
369 | ||
370 | if (pos >= 0) | |
371 | return pos; | |
372 | ||
373 | /* maybe unmerged? */ | |
374 | pos = -1 - pos; | |
375 | if (pos >= istate->cache_nr || | |
376 | compare_name((ce = istate->cache[pos]), path, namelen)) | |
377 | return -1; | |
378 | ||
379 | /* order of preference: stage 2, 1, 3 */ | |
380 | if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr && | |
381 | ce_stage((ce = istate->cache[pos + 1])) == 2 && | |
382 | !compare_name(ce, path, namelen)) | |
383 | pos++; | |
384 | return pos; | |
385 | } | |
386 | ||
4aab5b46 | 387 | int add_file_to_index(struct index_state *istate, const char *path, int verbose) |
11be42a4 | 388 | { |
0781b8a9 | 389 | int size, namelen, pos; |
11be42a4 JS |
390 | struct stat st; |
391 | struct cache_entry *ce; | |
fb63d7f8 | 392 | unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY; |
11be42a4 JS |
393 | |
394 | if (lstat(path, &st)) | |
395 | die("%s: unable to stat (%s)", path, strerror(errno)); | |
396 | ||
f35a6d3b LT |
397 | if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode) && !S_ISDIR(st.st_mode)) |
398 | die("%s: can only add regular files, symbolic links or git-directories", path); | |
11be42a4 JS |
399 | |
400 | namelen = strlen(path); | |
09595258 LT |
401 | if (S_ISDIR(st.st_mode)) { |
402 | while (namelen && path[namelen-1] == '/') | |
403 | namelen--; | |
404 | } | |
11be42a4 JS |
405 | size = cache_entry_size(namelen); |
406 | ce = xcalloc(1, size); | |
407 | memcpy(ce->name, path, namelen); | |
408 | ce->ce_flags = htons(namelen); | |
409 | fill_stat_cache_info(ce, &st); | |
410 | ||
78a8d641 | 411 | if (trust_executable_bit && has_symlinks) |
185c975f JH |
412 | ce->ce_mode = create_ce_mode(st.st_mode); |
413 | else { | |
78a8d641 JS |
414 | /* If there is an existing entry, pick the mode bits and type |
415 | * from it, otherwise assume unexecutable regular file. | |
11be42a4 | 416 | */ |
185c975f | 417 | struct cache_entry *ent; |
20314271 | 418 | int pos = index_name_pos_also_unmerged(istate, path, namelen); |
185c975f | 419 | |
4aab5b46 | 420 | ent = (0 <= pos) ? istate->cache[pos] : NULL; |
185c975f | 421 | ce->ce_mode = ce_mode_from_stat(ent, st.st_mode); |
11be42a4 JS |
422 | } |
423 | ||
0781b8a9 JH |
424 | pos = index_name_pos(istate, ce->name, namelen); |
425 | if (0 <= pos && | |
426 | !ce_stage(istate->cache[pos]) && | |
fb63d7f8 | 427 | !ie_match_stat(istate, istate->cache[pos], &st, ce_option)) { |
0781b8a9 JH |
428 | /* Nothing changed, really */ |
429 | free(ce); | |
430 | return 0; | |
431 | } | |
432 | ||
11be42a4 JS |
433 | if (index_path(ce->sha1, path, &st, 1)) |
434 | die("unable to index file %s", path); | |
4aab5b46 | 435 | if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE)) |
11be42a4 JS |
436 | die("unable to add %s to index",path); |
437 | if (verbose) | |
438 | printf("add '%s'\n", path); | |
11be42a4 JS |
439 | return 0; |
440 | } | |
441 | ||
6640f881 CR |
442 | struct cache_entry *make_cache_entry(unsigned int mode, |
443 | const unsigned char *sha1, const char *path, int stage, | |
444 | int refresh) | |
445 | { | |
446 | int size, len; | |
447 | struct cache_entry *ce; | |
448 | ||
449 | if (!verify_path(path)) | |
450 | return NULL; | |
451 | ||
452 | len = strlen(path); | |
453 | size = cache_entry_size(len); | |
454 | ce = xcalloc(1, size); | |
455 | ||
456 | hashcpy(ce->sha1, sha1); | |
457 | memcpy(ce->name, path, len); | |
458 | ce->ce_flags = create_ce_flags(len, stage); | |
459 | ce->ce_mode = create_ce_mode(mode); | |
460 | ||
461 | if (refresh) | |
462 | return refresh_cache_entry(ce, 0); | |
463 | ||
464 | return ce; | |
465 | } | |
466 | ||
dbbce55b | 467 | int ce_same_name(struct cache_entry *a, struct cache_entry *b) |
7b937ca3 LT |
468 | { |
469 | int len = ce_namelen(a); | |
470 | return ce_namelen(b) == len && !memcmp(a->name, b->name, len); | |
471 | } | |
472 | ||
c0fd1f51 LT |
473 | int ce_path_match(const struct cache_entry *ce, const char **pathspec) |
474 | { | |
475 | const char *match, *name; | |
476 | int len; | |
477 | ||
478 | if (!pathspec) | |
479 | return 1; | |
480 | ||
481 | len = ce_namelen(ce); | |
482 | name = ce->name; | |
483 | while ((match = *pathspec++) != NULL) { | |
484 | int matchlen = strlen(match); | |
485 | if (matchlen > len) | |
486 | continue; | |
487 | if (memcmp(name, match, matchlen)) | |
488 | continue; | |
489 | if (matchlen && name[matchlen-1] == '/') | |
490 | return 1; | |
491 | if (name[matchlen] == '/' || !name[matchlen]) | |
492 | return 1; | |
f332726e LT |
493 | if (!matchlen) |
494 | return 1; | |
c0fd1f51 LT |
495 | } |
496 | return 0; | |
497 | } | |
498 | ||
8dcf39c4 LT |
499 | /* |
500 | * We fundamentally don't like some paths: we don't want | |
501 | * dot or dot-dot anywhere, and for obvious reasons don't | |
502 | * want to recurse into ".git" either. | |
503 | * | |
504 | * Also, we don't want double slashes or slashes at the | |
505 | * end that can make pathnames ambiguous. | |
506 | */ | |
507 | static int verify_dotfile(const char *rest) | |
508 | { | |
509 | /* | |
510 | * The first character was '.', but that | |
511 | * has already been discarded, we now test | |
512 | * the rest. | |
513 | */ | |
514 | switch (*rest) { | |
515 | /* "." is not allowed */ | |
516 | case '\0': case '/': | |
517 | return 0; | |
518 | ||
519 | /* | |
520 | * ".git" followed by NUL or slash is bad. This | |
521 | * shares the path end test with the ".." case. | |
522 | */ | |
523 | case 'g': | |
524 | if (rest[1] != 'i') | |
525 | break; | |
526 | if (rest[2] != 't') | |
527 | break; | |
528 | rest += 2; | |
529 | /* fallthrough */ | |
530 | case '.': | |
531 | if (rest[1] == '\0' || rest[1] == '/') | |
532 | return 0; | |
533 | } | |
534 | return 1; | |
535 | } | |
536 | ||
537 | int verify_path(const char *path) | |
538 | { | |
539 | char c; | |
540 | ||
541 | goto inside; | |
542 | for (;;) { | |
543 | if (!c) | |
544 | return 1; | |
545 | if (c == '/') { | |
546 | inside: | |
547 | c = *path++; | |
548 | switch (c) { | |
549 | default: | |
550 | continue; | |
551 | case '/': case '\0': | |
552 | break; | |
553 | case '.': | |
554 | if (verify_dotfile(path)) | |
555 | continue; | |
556 | } | |
557 | return 0; | |
558 | } | |
559 | c = *path++; | |
560 | } | |
561 | } | |
562 | ||
12676608 LT |
563 | /* |
564 | * Do we have another file that has the beginning components being a | |
565 | * proper superset of the name we're trying to add? | |
0f1e4f04 | 566 | */ |
4aab5b46 JH |
567 | static int has_file_name(struct index_state *istate, |
568 | const struct cache_entry *ce, int pos, int ok_to_replace) | |
0f1e4f04 | 569 | { |
12676608 LT |
570 | int retval = 0; |
571 | int len = ce_namelen(ce); | |
b155725d | 572 | int stage = ce_stage(ce); |
12676608 | 573 | const char *name = ce->name; |
0f1e4f04 | 574 | |
4aab5b46 JH |
575 | while (pos < istate->cache_nr) { |
576 | struct cache_entry *p = istate->cache[pos++]; | |
0f1e4f04 | 577 | |
12676608 | 578 | if (len >= ce_namelen(p)) |
0f1e4f04 | 579 | break; |
12676608 LT |
580 | if (memcmp(name, p->name, len)) |
581 | break; | |
b155725d JH |
582 | if (ce_stage(p) != stage) |
583 | continue; | |
12676608 LT |
584 | if (p->name[len] != '/') |
585 | continue; | |
21cd8d00 JH |
586 | if (!ce_stage(p) && !p->ce_mode) |
587 | continue; | |
12676608 LT |
588 | retval = -1; |
589 | if (!ok_to_replace) | |
590 | break; | |
4aab5b46 | 591 | remove_index_entry_at(istate, --pos); |
0f1e4f04 | 592 | } |
12676608 LT |
593 | return retval; |
594 | } | |
0f1e4f04 | 595 | |
12676608 LT |
596 | /* |
597 | * Do we have another file with a pathname that is a proper | |
598 | * subset of the name we're trying to add? | |
599 | */ | |
4aab5b46 JH |
600 | static int has_dir_name(struct index_state *istate, |
601 | const struct cache_entry *ce, int pos, int ok_to_replace) | |
12676608 LT |
602 | { |
603 | int retval = 0; | |
b155725d | 604 | int stage = ce_stage(ce); |
12676608 LT |
605 | const char *name = ce->name; |
606 | const char *slash = name + ce_namelen(ce); | |
0f1e4f04 | 607 | |
12676608 LT |
608 | for (;;) { |
609 | int len; | |
0f1e4f04 | 610 | |
12676608 LT |
611 | for (;;) { |
612 | if (*--slash == '/') | |
613 | break; | |
614 | if (slash <= ce->name) | |
615 | return retval; | |
616 | } | |
617 | len = slash - name; | |
0f1e4f04 | 618 | |
4aab5b46 | 619 | pos = index_name_pos(istate, name, ntohs(create_ce_flags(len, stage))); |
12676608 | 620 | if (pos >= 0) { |
21cd8d00 JH |
621 | /* |
622 | * Found one, but not so fast. This could | |
623 | * be a marker that says "I was here, but | |
624 | * I am being removed". Such an entry is | |
625 | * not a part of the resulting tree, and | |
626 | * it is Ok to have a directory at the same | |
627 | * path. | |
628 | */ | |
4aab5b46 | 629 | if (stage || istate->cache[pos]->ce_mode) { |
21cd8d00 JH |
630 | retval = -1; |
631 | if (!ok_to_replace) | |
632 | break; | |
4aab5b46 | 633 | remove_index_entry_at(istate, pos); |
21cd8d00 JH |
634 | continue; |
635 | } | |
12676608 | 636 | } |
21cd8d00 JH |
637 | else |
638 | pos = -pos-1; | |
12676608 LT |
639 | |
640 | /* | |
641 | * Trivial optimization: if we find an entry that | |
642 | * already matches the sub-directory, then we know | |
b155725d | 643 | * we're ok, and we can exit. |
12676608 | 644 | */ |
4aab5b46 JH |
645 | while (pos < istate->cache_nr) { |
646 | struct cache_entry *p = istate->cache[pos]; | |
b155725d JH |
647 | if ((ce_namelen(p) <= len) || |
648 | (p->name[len] != '/') || | |
649 | memcmp(p->name, name, len)) | |
650 | break; /* not our subdirectory */ | |
21cd8d00 | 651 | if (ce_stage(p) == stage && (stage || p->ce_mode)) |
b155725d JH |
652 | /* p is at the same stage as our entry, and |
653 | * is a subdirectory of what we are looking | |
654 | * at, so we cannot have conflicts at our | |
655 | * level or anything shorter. | |
656 | */ | |
657 | return retval; | |
658 | pos++; | |
192268c1 | 659 | } |
0f1e4f04 | 660 | } |
12676608 LT |
661 | return retval; |
662 | } | |
663 | ||
664 | /* We may be in a situation where we already have path/file and path | |
665 | * is being added, or we already have path and path/file is being | |
666 | * added. Either one would result in a nonsense tree that has path | |
667 | * twice when git-write-tree tries to write it out. Prevent it. | |
a6080a0a | 668 | * |
12676608 LT |
669 | * If ok-to-replace is specified, we remove the conflicting entries |
670 | * from the cache so the caller should recompute the insert position. | |
671 | * When this happens, we return non-zero. | |
672 | */ | |
4aab5b46 JH |
673 | static int check_file_directory_conflict(struct index_state *istate, |
674 | const struct cache_entry *ce, | |
675 | int pos, int ok_to_replace) | |
12676608 | 676 | { |
21cd8d00 JH |
677 | int retval; |
678 | ||
679 | /* | |
680 | * When ce is an "I am going away" entry, we allow it to be added | |
681 | */ | |
682 | if (!ce_stage(ce) && !ce->ce_mode) | |
683 | return 0; | |
684 | ||
12676608 LT |
685 | /* |
686 | * We check if the path is a sub-path of a subsequent pathname | |
687 | * first, since removing those will not change the position | |
21cd8d00 | 688 | * in the array. |
12676608 | 689 | */ |
4aab5b46 | 690 | retval = has_file_name(istate, ce, pos, ok_to_replace); |
21cd8d00 | 691 | |
12676608 LT |
692 | /* |
693 | * Then check if the path might have a clashing sub-directory | |
694 | * before it. | |
695 | */ | |
4aab5b46 | 696 | return retval + has_dir_name(istate, ce, pos, ok_to_replace); |
0f1e4f04 JH |
697 | } |
698 | ||
af3785dc | 699 | static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option) |
197ee8c9 LT |
700 | { |
701 | int pos; | |
192268c1 JH |
702 | int ok_to_add = option & ADD_CACHE_OK_TO_ADD; |
703 | int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; | |
b155725d | 704 | int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; |
5f73076c | 705 | |
09d5dc32 | 706 | cache_tree_invalidate_path(istate->cache_tree, ce->name); |
4aab5b46 | 707 | pos = index_name_pos(istate, ce->name, ntohs(ce->ce_flags)); |
197ee8c9 | 708 | |
3e09cdfd | 709 | /* existing match? Just replace it. */ |
76e7f4ec | 710 | if (pos >= 0) { |
4aab5b46 JH |
711 | istate->cache_changed = 1; |
712 | istate->cache[pos] = ce; | |
197ee8c9 LT |
713 | return 0; |
714 | } | |
76e7f4ec | 715 | pos = -pos-1; |
197ee8c9 | 716 | |
7b937ca3 LT |
717 | /* |
718 | * Inserting a merged entry ("stage 0") into the index | |
719 | * will always replace all non-merged entries.. | |
720 | */ | |
4aab5b46 JH |
721 | if (pos < istate->cache_nr && ce_stage(ce) == 0) { |
722 | while (ce_same_name(istate->cache[pos], ce)) { | |
7b937ca3 | 723 | ok_to_add = 1; |
4aab5b46 | 724 | if (!remove_index_entry_at(istate, pos)) |
7b937ca3 LT |
725 | break; |
726 | } | |
727 | } | |
728 | ||
121481ab LT |
729 | if (!ok_to_add) |
730 | return -1; | |
8dcf39c4 LT |
731 | if (!verify_path(ce->name)) |
732 | return -1; | |
121481ab | 733 | |
3e09cdfd | 734 | if (!skip_df_check && |
4aab5b46 | 735 | check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { |
192268c1 | 736 | if (!ok_to_replace) |
4aab5b46 JH |
737 | return error("'%s' appears as both a file and as a directory", |
738 | ce->name); | |
739 | pos = index_name_pos(istate, ce->name, ntohs(ce->ce_flags)); | |
192268c1 JH |
740 | pos = -pos-1; |
741 | } | |
af3785dc JH |
742 | return pos + 1; |
743 | } | |
744 | ||
745 | int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option) | |
746 | { | |
747 | int pos; | |
748 | ||
749 | if (option & ADD_CACHE_JUST_APPEND) | |
750 | pos = istate->cache_nr; | |
751 | else { | |
752 | int ret; | |
753 | ret = add_index_entry_with_check(istate, ce, option); | |
754 | if (ret <= 0) | |
755 | return ret; | |
756 | pos = ret - 1; | |
757 | } | |
0f1e4f04 | 758 | |
197ee8c9 | 759 | /* Make sure the array is big enough .. */ |
4aab5b46 JH |
760 | if (istate->cache_nr == istate->cache_alloc) { |
761 | istate->cache_alloc = alloc_nr(istate->cache_alloc); | |
762 | istate->cache = xrealloc(istate->cache, | |
763 | istate->cache_alloc * sizeof(struct cache_entry *)); | |
197ee8c9 LT |
764 | } |
765 | ||
766 | /* Add it in.. */ | |
4aab5b46 | 767 | istate->cache_nr++; |
af3785dc | 768 | if (istate->cache_nr > pos + 1) |
4aab5b46 JH |
769 | memmove(istate->cache + pos + 1, |
770 | istate->cache + pos, | |
771 | (istate->cache_nr - pos - 1) * sizeof(ce)); | |
772 | istate->cache[pos] = ce; | |
773 | istate->cache_changed = 1; | |
197ee8c9 LT |
774 | return 0; |
775 | } | |
776 | ||
405e5b2f LT |
777 | /* |
778 | * "refresh" does not calculate a new sha1 file or bring the | |
779 | * cache up-to-date for mode/content changes. But what it | |
780 | * _does_ do is to "re-match" the stat information of a file | |
781 | * with the cache, so that you can refresh the cache for a | |
782 | * file that hasn't been changed but where the stat entry is | |
783 | * out of date. | |
784 | * | |
785 | * For example, you'd want to do this after doing a "git-read-tree", | |
786 | * to link up the stat cache details with the proper files. | |
787 | */ | |
4aab5b46 | 788 | static struct cache_entry *refresh_cache_ent(struct index_state *istate, |
4bd5b7da JH |
789 | struct cache_entry *ce, |
790 | unsigned int options, int *err) | |
405e5b2f LT |
791 | { |
792 | struct stat st; | |
793 | struct cache_entry *updated; | |
794 | int changed, size; | |
4bd5b7da | 795 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; |
405e5b2f | 796 | |
8fd2cb40 | 797 | if (lstat(ce->name, &st) < 0) { |
ec0cc704 JH |
798 | if (err) |
799 | *err = errno; | |
8fd2cb40 JS |
800 | return NULL; |
801 | } | |
405e5b2f | 802 | |
4bd5b7da | 803 | changed = ie_match_stat(istate, ce, &st, options); |
405e5b2f | 804 | if (!changed) { |
4bd5b7da JH |
805 | /* |
806 | * The path is unchanged. If we were told to ignore | |
807 | * valid bit, then we did the actual stat check and | |
808 | * found that the entry is unmodified. If the entry | |
809 | * is not marked VALID, this is the place to mark it | |
810 | * valid again, under "assume unchanged" mode. | |
811 | */ | |
812 | if (ignore_valid && assume_unchanged && | |
405e5b2f LT |
813 | !(ce->ce_flags & htons(CE_VALID))) |
814 | ; /* mark this one VALID again */ | |
815 | else | |
8fd2cb40 | 816 | return ce; |
405e5b2f LT |
817 | } |
818 | ||
4bd5b7da | 819 | if (ie_modified(istate, ce, &st, options)) { |
ec0cc704 JH |
820 | if (err) |
821 | *err = EINVAL; | |
8fd2cb40 JS |
822 | return NULL; |
823 | } | |
405e5b2f LT |
824 | |
825 | size = ce_size(ce); | |
826 | updated = xmalloc(size); | |
827 | memcpy(updated, ce, size); | |
828 | fill_stat_cache_info(updated, &st); | |
829 | ||
4bd5b7da JH |
830 | /* |
831 | * If ignore_valid is not set, we should leave CE_VALID bit | |
832 | * alone. Otherwise, paths marked with --no-assume-unchanged | |
833 | * (i.e. things to be edited) will reacquire CE_VALID bit | |
834 | * automatically, which is not really what we want. | |
405e5b2f | 835 | */ |
4bd5b7da JH |
836 | if (!ignore_valid && assume_unchanged && |
837 | !(ce->ce_flags & htons(CE_VALID))) | |
405e5b2f LT |
838 | updated->ce_flags &= ~htons(CE_VALID); |
839 | ||
840 | return updated; | |
841 | } | |
842 | ||
d616813d | 843 | int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec, char *seen) |
405e5b2f LT |
844 | { |
845 | int i; | |
846 | int has_errors = 0; | |
847 | int really = (flags & REFRESH_REALLY) != 0; | |
848 | int allow_unmerged = (flags & REFRESH_UNMERGED) != 0; | |
849 | int quiet = (flags & REFRESH_QUIET) != 0; | |
850 | int not_new = (flags & REFRESH_IGNORE_MISSING) != 0; | |
4bd5b7da | 851 | unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0; |
405e5b2f | 852 | |
4aab5b46 | 853 | for (i = 0; i < istate->cache_nr; i++) { |
405e5b2f | 854 | struct cache_entry *ce, *new; |
ec0cc704 JH |
855 | int cache_errno = 0; |
856 | ||
4aab5b46 | 857 | ce = istate->cache[i]; |
405e5b2f | 858 | if (ce_stage(ce)) { |
4aab5b46 JH |
859 | while ((i < istate->cache_nr) && |
860 | ! strcmp(istate->cache[i]->name, ce->name)) | |
405e5b2f LT |
861 | i++; |
862 | i--; | |
863 | if (allow_unmerged) | |
864 | continue; | |
865 | printf("%s: needs merge\n", ce->name); | |
866 | has_errors = 1; | |
867 | continue; | |
868 | } | |
869 | ||
d616813d AJ |
870 | if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen)) |
871 | continue; | |
872 | ||
4bd5b7da | 873 | new = refresh_cache_ent(istate, ce, options, &cache_errno); |
8fd2cb40 | 874 | if (new == ce) |
405e5b2f | 875 | continue; |
8fd2cb40 JS |
876 | if (!new) { |
877 | if (not_new && cache_errno == ENOENT) | |
405e5b2f | 878 | continue; |
8fd2cb40 | 879 | if (really && cache_errno == EINVAL) { |
405e5b2f LT |
880 | /* If we are doing --really-refresh that |
881 | * means the index is not valid anymore. | |
882 | */ | |
883 | ce->ce_flags &= ~htons(CE_VALID); | |
4aab5b46 | 884 | istate->cache_changed = 1; |
405e5b2f LT |
885 | } |
886 | if (quiet) | |
887 | continue; | |
888 | printf("%s: needs update\n", ce->name); | |
889 | has_errors = 1; | |
890 | continue; | |
891 | } | |
4aab5b46 JH |
892 | istate->cache_changed = 1; |
893 | /* You can NOT just free istate->cache[i] here, since it | |
405e5b2f LT |
894 | * might not be necessarily malloc()ed but can also come |
895 | * from mmap(). */ | |
4aab5b46 | 896 | istate->cache[i] = new; |
405e5b2f LT |
897 | } |
898 | return has_errors; | |
899 | } | |
900 | ||
ec0cc704 JH |
901 | struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really) |
902 | { | |
4aab5b46 | 903 | return refresh_cache_ent(&the_index, ce, really, NULL); |
ec0cc704 JH |
904 | } |
905 | ||
bad68ec9 | 906 | static int verify_hdr(struct cache_header *hdr, unsigned long size) |
e83c5163 LT |
907 | { |
908 | SHA_CTX c; | |
bad68ec9 | 909 | unsigned char sha1[20]; |
e83c5163 | 910 | |
ccc4feb5 | 911 | if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) |
e83c5163 | 912 | return error("bad signature"); |
ca9be054 LT |
913 | if (hdr->hdr_version != htonl(2)) |
914 | return error("bad index version"); | |
e83c5163 | 915 | SHA1_Init(&c); |
ca9be054 | 916 | SHA1_Update(&c, hdr, size - 20); |
e83c5163 | 917 | SHA1_Final(sha1, &c); |
a89fccd2 | 918 | if (hashcmp(sha1, (unsigned char *)hdr + size - 20)) |
ca9be054 | 919 | return error("bad index file sha1 signature"); |
e83c5163 LT |
920 | return 0; |
921 | } | |
922 | ||
4aab5b46 JH |
923 | static int read_index_extension(struct index_state *istate, |
924 | const char *ext, void *data, unsigned long sz) | |
bad68ec9 JH |
925 | { |
926 | switch (CACHE_EXT(ext)) { | |
927 | case CACHE_EXT_TREE: | |
4aab5b46 | 928 | istate->cache_tree = cache_tree_read(data, sz); |
bad68ec9 JH |
929 | break; |
930 | default: | |
931 | if (*ext < 'A' || 'Z' < *ext) | |
932 | return error("index uses %.4s extension, which we do not understand", | |
933 | ext); | |
934 | fprintf(stderr, "ignoring %.4s extension\n", ext); | |
935 | break; | |
936 | } | |
937 | return 0; | |
938 | } | |
939 | ||
4aab5b46 | 940 | int read_index(struct index_state *istate) |
8fd2cb40 | 941 | { |
4aab5b46 | 942 | return read_index_from(istate, get_index_file()); |
8fd2cb40 JS |
943 | } |
944 | ||
945 | /* remember to discard_cache() before reading a different cache! */ | |
4aab5b46 | 946 | int read_index_from(struct index_state *istate, const char *path) |
e83c5163 LT |
947 | { |
948 | int fd, i; | |
949 | struct stat st; | |
8fd2cb40 | 950 | unsigned long offset; |
e83c5163 LT |
951 | struct cache_header *hdr; |
952 | ||
953 | errno = EBUSY; | |
4aab5b46 JH |
954 | if (istate->mmap) |
955 | return istate->cache_nr; | |
5d1a5c02 | 956 | |
e83c5163 | 957 | errno = ENOENT; |
4aab5b46 | 958 | istate->timestamp = 0; |
8fd2cb40 | 959 | fd = open(path, O_RDONLY); |
5d1a5c02 LT |
960 | if (fd < 0) { |
961 | if (errno == ENOENT) | |
962 | return 0; | |
963 | die("index file open failed (%s)", strerror(errno)); | |
964 | } | |
e83c5163 | 965 | |
3511a377 | 966 | if (fstat(fd, &st)) |
5fe5c830 | 967 | die("cannot stat the open index (%s)", strerror(errno)); |
3511a377 LFC |
968 | |
969 | errno = EINVAL; | |
970 | istate->mmap_size = xsize_t(st.st_size); | |
971 | if (istate->mmap_size < sizeof(struct cache_header) + 20) | |
972 | die("index file smaller than expected"); | |
973 | ||
974 | istate->mmap = xmmap(NULL, istate->mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); | |
e83c5163 | 975 | close(fd); |
e83c5163 | 976 | |
4aab5b46 JH |
977 | hdr = istate->mmap; |
978 | if (verify_hdr(hdr, istate->mmap_size) < 0) | |
e83c5163 LT |
979 | goto unmap; |
980 | ||
4aab5b46 JH |
981 | istate->cache_nr = ntohl(hdr->hdr_entries); |
982 | istate->cache_alloc = alloc_nr(istate->cache_nr); | |
983 | istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *)); | |
e83c5163 LT |
984 | |
985 | offset = sizeof(*hdr); | |
4aab5b46 JH |
986 | for (i = 0; i < istate->cache_nr; i++) { |
987 | struct cache_entry *ce; | |
988 | ||
989 | ce = (struct cache_entry *)((char *)(istate->mmap) + offset); | |
e83c5163 | 990 | offset = offset + ce_size(ce); |
4aab5b46 | 991 | istate->cache[i] = ce; |
e83c5163 | 992 | } |
4aab5b46 JH |
993 | istate->timestamp = st.st_mtime; |
994 | while (offset <= istate->mmap_size - 20 - 8) { | |
bad68ec9 JH |
995 | /* After an array of active_nr index entries, |
996 | * there can be arbitrary number of extended | |
997 | * sections, each of which is prefixed with | |
998 | * extension name (4-byte) and section length | |
999 | * in 4-byte network byte order. | |
1000 | */ | |
1001 | unsigned long extsize; | |
4aab5b46 | 1002 | memcpy(&extsize, (char *)(istate->mmap) + offset + 4, 4); |
bad68ec9 | 1003 | extsize = ntohl(extsize); |
4aab5b46 JH |
1004 | if (read_index_extension(istate, |
1005 | ((const char *) (istate->mmap)) + offset, | |
1006 | (char *) (istate->mmap) + offset + 8, | |
1d7f171c | 1007 | extsize) < 0) |
bad68ec9 JH |
1008 | goto unmap; |
1009 | offset += 8; | |
1010 | offset += extsize; | |
1011 | } | |
4aab5b46 | 1012 | return istate->cache_nr; |
e83c5163 LT |
1013 | |
1014 | unmap: | |
4aab5b46 | 1015 | munmap(istate->mmap, istate->mmap_size); |
e83c5163 | 1016 | errno = EINVAL; |
5d1a5c02 | 1017 | die("index file corrupt"); |
e83c5163 LT |
1018 | } |
1019 | ||
4aab5b46 | 1020 | int discard_index(struct index_state *istate) |
6d297f81 JS |
1021 | { |
1022 | int ret; | |
1023 | ||
4aab5b46 JH |
1024 | istate->cache_nr = 0; |
1025 | istate->cache_changed = 0; | |
1026 | istate->timestamp = 0; | |
1027 | cache_tree_free(&(istate->cache_tree)); | |
1028 | if (istate->mmap == NULL) | |
6d297f81 | 1029 | return 0; |
4aab5b46 JH |
1030 | ret = munmap(istate->mmap, istate->mmap_size); |
1031 | istate->mmap = NULL; | |
1032 | istate->mmap_size = 0; | |
6d297f81 JS |
1033 | |
1034 | /* no need to throw away allocated active_cache */ | |
1035 | return ret; | |
1036 | } | |
1037 | ||
4990aadc | 1038 | #define WRITE_BUFFER_SIZE 8192 |
bf0f910d | 1039 | static unsigned char write_buffer[WRITE_BUFFER_SIZE]; |
4990aadc LT |
1040 | static unsigned long write_buffer_len; |
1041 | ||
6015c28b JH |
1042 | static int ce_write_flush(SHA_CTX *context, int fd) |
1043 | { | |
1044 | unsigned int buffered = write_buffer_len; | |
1045 | if (buffered) { | |
1046 | SHA1_Update(context, write_buffer, buffered); | |
93822c22 | 1047 | if (write_in_full(fd, write_buffer, buffered) != buffered) |
6015c28b JH |
1048 | return -1; |
1049 | write_buffer_len = 0; | |
1050 | } | |
1051 | return 0; | |
1052 | } | |
1053 | ||
ca9be054 | 1054 | static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len) |
4990aadc LT |
1055 | { |
1056 | while (len) { | |
1057 | unsigned int buffered = write_buffer_len; | |
1058 | unsigned int partial = WRITE_BUFFER_SIZE - buffered; | |
1059 | if (partial > len) | |
1060 | partial = len; | |
1061 | memcpy(write_buffer + buffered, data, partial); | |
1062 | buffered += partial; | |
1063 | if (buffered == WRITE_BUFFER_SIZE) { | |
6015c28b JH |
1064 | write_buffer_len = buffered; |
1065 | if (ce_write_flush(context, fd)) | |
4990aadc LT |
1066 | return -1; |
1067 | buffered = 0; | |
1068 | } | |
1069 | write_buffer_len = buffered; | |
1070 | len -= partial; | |
1d7f171c | 1071 | data = (char *) data + partial; |
a6080a0a JH |
1072 | } |
1073 | return 0; | |
4990aadc LT |
1074 | } |
1075 | ||
bad68ec9 | 1076 | static int write_index_ext_header(SHA_CTX *context, int fd, |
ac58c7b1 | 1077 | unsigned int ext, unsigned int sz) |
bad68ec9 JH |
1078 | { |
1079 | ext = htonl(ext); | |
1080 | sz = htonl(sz); | |
968a1d65 DR |
1081 | return ((ce_write(context, fd, &ext, 4) < 0) || |
1082 | (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0; | |
bad68ec9 JH |
1083 | } |
1084 | ||
1085 | static int ce_flush(SHA_CTX *context, int fd) | |
4990aadc LT |
1086 | { |
1087 | unsigned int left = write_buffer_len; | |
ca9be054 | 1088 | |
4990aadc LT |
1089 | if (left) { |
1090 | write_buffer_len = 0; | |
ca9be054 | 1091 | SHA1_Update(context, write_buffer, left); |
4990aadc | 1092 | } |
ca9be054 | 1093 | |
2c865d9a QH |
1094 | /* Flush first if not enough space for SHA1 signature */ |
1095 | if (left + 20 > WRITE_BUFFER_SIZE) { | |
93822c22 | 1096 | if (write_in_full(fd, write_buffer, left) != left) |
2c865d9a QH |
1097 | return -1; |
1098 | left = 0; | |
1099 | } | |
1100 | ||
ca9be054 | 1101 | /* Append the SHA1 signature at the end */ |
bad68ec9 | 1102 | SHA1_Final(write_buffer + left, context); |
ca9be054 | 1103 | left += 20; |
93822c22 | 1104 | return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0; |
4990aadc LT |
1105 | } |
1106 | ||
407c8eb0 JH |
1107 | static void ce_smudge_racily_clean_entry(struct cache_entry *ce) |
1108 | { | |
1109 | /* | |
1110 | * The only thing we care about in this function is to smudge the | |
1111 | * falsely clean entry due to touch-update-touch race, so we leave | |
1112 | * everything else as they are. We are called for entries whose | |
1113 | * ce_mtime match the index file mtime. | |
1114 | */ | |
1115 | struct stat st; | |
1116 | ||
1117 | if (lstat(ce->name, &st) < 0) | |
1118 | return; | |
1119 | if (ce_match_stat_basic(ce, &st)) | |
1120 | return; | |
1121 | if (ce_modified_check_fs(ce, &st)) { | |
4b3511b0 JH |
1122 | /* This is "racily clean"; smudge it. Note that this |
1123 | * is a tricky code. At first glance, it may appear | |
1124 | * that it can break with this sequence: | |
1125 | * | |
1126 | * $ echo xyzzy >frotz | |
1127 | * $ git-update-index --add frotz | |
1128 | * $ : >frotz | |
1129 | * $ sleep 3 | |
1130 | * $ echo filfre >nitfol | |
1131 | * $ git-update-index --add nitfol | |
1132 | * | |
b7e58b17 | 1133 | * but it does not. When the second update-index runs, |
4b3511b0 JH |
1134 | * it notices that the entry "frotz" has the same timestamp |
1135 | * as index, and if we were to smudge it by resetting its | |
1136 | * size to zero here, then the object name recorded | |
1137 | * in index is the 6-byte file but the cached stat information | |
1138 | * becomes zero --- which would then match what we would | |
a6080a0a | 1139 | * obtain from the filesystem next time we stat("frotz"). |
4b3511b0 JH |
1140 | * |
1141 | * However, the second update-index, before calling | |
1142 | * this function, notices that the cached size is 6 | |
1143 | * bytes and what is on the filesystem is an empty | |
1144 | * file, and never calls us, so the cached size information | |
1145 | * for "frotz" stays 6 which does not match the filesystem. | |
1146 | */ | |
407c8eb0 JH |
1147 | ce->ce_size = htonl(0); |
1148 | } | |
1149 | } | |
1150 | ||
4aab5b46 | 1151 | int write_index(struct index_state *istate, int newfd) |
197ee8c9 LT |
1152 | { |
1153 | SHA_CTX c; | |
1154 | struct cache_header hdr; | |
1dffb8fa | 1155 | int i, err, removed; |
4aab5b46 JH |
1156 | struct cache_entry **cache = istate->cache; |
1157 | int entries = istate->cache_nr; | |
025a0709 JH |
1158 | |
1159 | for (i = removed = 0; i < entries; i++) | |
1160 | if (!cache[i]->ce_mode) | |
1161 | removed++; | |
197ee8c9 | 1162 | |
ccc4feb5 | 1163 | hdr.hdr_signature = htonl(CACHE_SIGNATURE); |
ca9be054 | 1164 | hdr.hdr_version = htonl(2); |
025a0709 | 1165 | hdr.hdr_entries = htonl(entries - removed); |
197ee8c9 LT |
1166 | |
1167 | SHA1_Init(&c); | |
ca9be054 | 1168 | if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0) |
197ee8c9 LT |
1169 | return -1; |
1170 | ||
1171 | for (i = 0; i < entries; i++) { | |
1172 | struct cache_entry *ce = cache[i]; | |
aa16021e LT |
1173 | if (!ce->ce_mode) |
1174 | continue; | |
4aab5b46 JH |
1175 | if (istate->timestamp && |
1176 | istate->timestamp <= ntohl(ce->ce_mtime.sec)) | |
407c8eb0 | 1177 | ce_smudge_racily_clean_entry(ce); |
ca9be054 | 1178 | if (ce_write(&c, newfd, ce, ce_size(ce)) < 0) |
197ee8c9 LT |
1179 | return -1; |
1180 | } | |
1af1c2b6 | 1181 | |
bad68ec9 | 1182 | /* Write extension data here */ |
4aab5b46 | 1183 | if (istate->cache_tree) { |
1dffb8fa PH |
1184 | struct strbuf sb; |
1185 | ||
1186 | strbuf_init(&sb, 0); | |
1187 | cache_tree_write(&sb, istate->cache_tree); | |
1188 | err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0 | |
1189 | || ce_write(&c, newfd, sb.buf, sb.len) < 0; | |
1190 | strbuf_release(&sb); | |
1191 | if (err) | |
bad68ec9 | 1192 | return -1; |
bad68ec9 JH |
1193 | } |
1194 | return ce_flush(&c, newfd); | |
197ee8c9 | 1195 | } |