Use struct tree in tar-tree
It was using an open-coded tree parser; use a struct tree instead. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Daniel Barkalow committed
Jan 29, 2006 at 14:04 UTC
5207234a68aebf1f7a6494f6197513b00c8a70f3
1 file changed
+24
-26
tar-tree.c
+24
-26
@@ -3,6 +3,7 @@
3
*/
4
#include <time.h>
5
#include "cache.h"
6
+#include "tree.h"
7
8
#define RECORDSIZE (512)
9
#define BLOCKSIZE (RECORDSIZE * 20)
@@ -334,40 +335,37 @@ static void write_header(const unsigned char *sha1, char typeflag, const char *b
335
write_if_needed();
336
}
337
337
-static void traverse_tree(void *buffer, unsigned long size,
338
+static void traverse_tree(struct tree *tree,
339
struct path_prefix *prefix)
340
{
341
struct path_prefix this_prefix;
342
+ struct tree_entry_list *item;
343
this_prefix.prev = prefix;
344
343
- while (size) {
344
- int namelen = strlen(buffer)+1;
345
+ parse_tree(tree);
346
+ item = tree->entries;
347
+
348
+ while (item) {
349
void *eltbuf;
350
char elttype[20];
351
unsigned long eltsize;
348
- unsigned char *sha1 = buffer + namelen;
349
- char *path = strchr(buffer, ' ') + 1;
350
- unsigned int mode;
351
-
352
- if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
353
- die("corrupt 'tree' file");
354
- if (S_ISDIR(mode) || S_ISREG(mode))
355
- mode |= (mode & 0100) ? 0777 : 0666;
356
- buffer = sha1 + 20;
357
- size -= namelen + 20;
358
-
359
- eltbuf = read_sha1_file(sha1, elttype, &eltsize);
352
+
353
+ eltbuf = read_sha1_file(item->item.any->sha1,
354
+ elttype, &eltsize);
355
if (!eltbuf)
361
- die("cannot read %s", sha1_to_hex(sha1));
362
- write_header(sha1, TYPEFLAG_AUTO, basedir, prefix, path,
363
- mode, eltbuf, eltsize);
364
- if (!strcmp(elttype, "tree")) {
365
- this_prefix.name = path;
366
- traverse_tree(eltbuf, eltsize, &this_prefix);
367
- } else if (!strcmp(elttype, "blob") && !S_ISLNK(mode)) {
356
+ die("cannot read %s",
357
+ sha1_to_hex(item->item.any->sha1));
358
+ write_header(item->item.any->sha1, TYPEFLAG_AUTO, basedir,
359
+ prefix, item->name,
360
+ item->mode, eltbuf, eltsize);
361
+ if (item->directory) {
362
+ this_prefix.name = item->name;
363
+ traverse_tree(item->item.tree, &this_prefix);
364
+ } else if (!item->symlink) {
365
write_blocked(eltbuf, eltsize);
366
}
367
free(eltbuf);
368
+ item = item->next;
369
}
370
}
371
@@ -404,6 +402,7 @@ int main(int argc, char **argv)
402
unsigned char commit_sha1[20];
403
void *buffer;
404
unsigned long size;
405
+ struct tree *tree;
406
407
setup_git_directory();
408
@@ -425,8 +424,8 @@ int main(int argc, char **argv)
424
archive_time = commit_time(buffer, size);
425
free(buffer);
426
}
428
- buffer = read_object_with_reference(sha1, "tree", &size, NULL);
429
- if (!buffer)
427
+ tree = parse_tree_indirect(sha1);
428
+ if (!tree)
429
die("not a reference to a tag, commit or tree object: %s",
430
sha1_to_hex(sha1));
431
if (!archive_time)
@@ -434,8 +433,7 @@ int main(int argc, char **argv)
433
if (basedir)
434
write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL,
435
basedir, 040777, NULL, 0);
437
- traverse_tree(buffer, size, NULL);
438
- free(buffer);
436
+ traverse_tree(tree, NULL);
437
write_trailer();
438
return 0;
439
}