mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/fsck-fixes'

Browse Source 
* jc/fsck-fixes:
  fsck: do not give up too early in fsck_dir()
  fsck: drop unused parameter from traverse_one_object()
This commit is contained in:
Junio C Hamano
2011-02-09 16:41:17 -08:00
parent 1bb4abeff7 ea6f0a23ac
commit 7fb9ec2123
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
builtin/fsck.c
View File

@ -74,7 +74,13 @@ static int mark_object(struct object *obj, int type, void *data)
{ {
struct object *parent = data; struct object *parent = data;
/*
* The only case data is NULL or type is OBJ_ANY is when
* mark_object_reachable() calls us. All the callers of
* that function has non-NULL obj hence ...
*/
if (!obj) { if (!obj) {
/* ... these references to parent->fld are safe here */
printf("broken link from %7s %s\n", printf("broken link from %7s %s\n",
typename(parent->type), sha1_to_hex(parent->sha1)); typename(parent->type), sha1_to_hex(parent->sha1));
printf("broken link from %7s %s\n", printf("broken link from %7s %s\n",
@ -84,6 +90,7 @@ static int mark_object(struct object *obj, int type, void *data)
} }
if (type != OBJ_ANY && obj->type != type) if (type != OBJ_ANY && obj->type != type)
/* ... and the reference to parent is safe here */
objerror(parent, "wrong object type in link"); objerror(parent, "wrong object type in link");
if (obj->flags & REACHABLE) if (obj->flags & REACHABLE)
@ -109,7 +116,7 @@ static void mark_object_reachable(struct object *obj)
mark_object(obj, OBJ_ANY, NULL); mark_object(obj, OBJ_ANY, NULL);
} }
static int traverse_one_object(struct object *obj, struct object *parent) static int traverse_one_object(struct object *obj)
{ {
int result; int result;
struct tree *tree = NULL; struct tree *tree = NULL;
@ -138,7 +145,7 @@ static int traverse_reachable(void)
entry = pending.objects + --pending.nr; entry = pending.objects + --pending.nr;
obj = entry->item; obj = entry->item;
parent = (struct object *) entry->name; parent = (struct object *) entry->name;
result |= traverse_one_object(obj, parent); result |= traverse_one_object(obj);
} }
return !!result; return !!result;
} }
@ -385,10 +392,20 @@ static void add_sha1_list(unsigned char *sha1, unsigned long ino)
sha1_list.nr = ++nr; sha1_list.nr = ++nr;
} }
static inline int is_loose_object_file(struct dirent *de,
char *name, unsigned char *sha1)
{
if (strlen(de->d_name) != 38)
return 0;
memcpy(name + 2, de->d_name, 39);
return !get_sha1_hex(name, sha1);
}
static void fsck_dir(int i, char *path) static void fsck_dir(int i, char *path)
{ {
DIR *dir = opendir(path); DIR *dir = opendir(path);
struct dirent *de; struct dirent *de;
char name[100];
if (!dir) if (!dir)
return; return;
@ -396,17 +413,13 @@ static void fsck_dir(int i, char *path)
if (verbose) if (verbose)
fprintf(stderr, "Checking directory %s\n", path); fprintf(stderr, "Checking directory %s\n", path);
sprintf(name, "%02x", i);
while ((de = readdir(dir)) != NULL) { while ((de = readdir(dir)) != NULL) {
char name[100];
unsigned char sha1[20]; unsigned char sha1[20];
if (is_dot_or_dotdot(de->d_name)) if (is_dot_or_dotdot(de->d_name))
continue; continue;
if (strlen(de->d_name) == 38) { if (is_loose_object_file(de, name, sha1)) {
sprintf(name, "%02x", i);
memcpy(name+2, de->d_name, 39);
if (get_sha1_hex(name, sha1) < 0)
break;
add_sha1_list(sha1, DIRENT_SORT_HINT(de)); add_sha1_list(sha1, DIRENT_SORT_HINT(de));
continue; continue;
} }
@ -556,8 +569,8 @@ static int fsck_cache_tree(struct cache_tree *it)
sha1_to_hex(it->sha1)); sha1_to_hex(it->sha1));
return 1; return 1;
} }
mark_object_reachable(obj);
obj->used = 1; obj->used = 1;
mark_object_reachable(obj);
if (obj->type != OBJ_TREE) if (obj->type != OBJ_TREE)
err |= objerror(obj, "non-tree in cache-tree"); err |= objerror(obj, "non-tree in cache-tree");
} }