X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tar-tree.c;h=e85a1ed6605459fdbb60e3b24022e7e250b93a91;hb=8e1618f9612a78ea09b2a926797c781fe06027c9;hp=d313c80565824824f2e954510d5bbbc65b8e116b;hpb=92747a907cba83938def6e7eb3ee1b4d3d9e609f;p=git.git diff --git a/tar-tree.c b/tar-tree.c index d313c805..e85a1ed6 100644 --- a/tar-tree.c +++ b/tar-tree.c @@ -3,6 +3,8 @@ */ #include #include "cache.h" +#include "diff.h" +#include "commit.h" #define RECORDSIZE (512) #define BLOCKSIZE (RECORDSIZE * 20) @@ -17,7 +19,7 @@ #define EXT_HEADER_PATH 1 #define EXT_HEADER_LINKPATH 2 -static const char *tar_tree_usage = "tar-tree [basedir]"; +static const char tar_tree_usage[] = "git-tar-tree [basedir]"; static char block[BLOCKSIZE]; static unsigned long offset; @@ -34,15 +36,13 @@ struct path_prefix { static void reliable_write(void *buf, unsigned long size) { while (size > 0) { - long ret = write(1, buf, size); + long ret = xwrite(1, buf, size); if (ret < 0) { - if (errno == EAGAIN) - continue; if (errno == EPIPE) exit(0); - die("tar-tree: %s", strerror(errno)); + die("git-tar-tree: %s", strerror(errno)); } else if (!ret) { - die("tar-tree: disk full?"); + die("git-tar-tree: disk full?"); } size -= ret; buf += ret; @@ -73,16 +73,13 @@ static char *get_record(void) */ static void write_trailer(void) { - memset(block + offset, 0, RECORDSIZE); - offset += RECORDSIZE; + get_record(); write_if_needed(); - memset(block + offset, 0, RECORDSIZE); - offset += RECORDSIZE; + get_record(); write_if_needed(); - if (offset) { - memset(block + offset, 0, BLOCKSIZE - offset); - reliable_write(block, BLOCKSIZE); - offset = 0; + while (offset) { + get_record(); + write_if_needed(); } } @@ -205,7 +202,7 @@ static void append_extended_header(char **p, const char *keyword, append_char(p, '\n'); } -static void write_header(const char *, char, const char *, struct path_prefix *, +static void write_header(const unsigned char *, char, const char *, struct path_prefix *, const char *, unsigned int, void *, unsigned long); /* stores a pax extended header directly in the block buffer */ @@ -238,7 +235,7 @@ static void write_extended_header(const char *headerfilename, int is_dir, free(buffer); } -static void write_global_extended_header(const char *sha1) +static void write_global_extended_header(const unsigned char *sha1) { char *p; unsigned int size; @@ -253,7 +250,7 @@ static void write_global_extended_header(const char *sha1) } /* stores a ustar header directly in the block buffer */ -static void write_header(const char *sha1, char typeflag, const char *basepath, +static void write_header(const unsigned char *sha1, char typeflag, const char *basepath, struct path_prefix *prefix, const char *path, unsigned int mode, void *buffer, unsigned long size) { @@ -328,8 +325,8 @@ static void write_header(const char *sha1, char typeflag, const char *basepath, memcpy(&header[257], "ustar", 6); memcpy(&header[263], "00", 2); - printf(&header[329], "%07o", 0); /* devmajor */ - printf(&header[337], "%07o", 0); /* devminor */ + sprintf(&header[329], "%07o", 0); /* devmajor */ + sprintf(&header[337], "%07o", 0); /* devminor */ memset(&header[148], ' ', 8); for (i = 0; i < RECORDSIZE; i++) @@ -339,74 +336,48 @@ static void write_header(const char *sha1, char typeflag, const char *basepath, write_if_needed(); } -static void traverse_tree(void *buffer, unsigned long size, +static void traverse_tree(struct tree_desc *tree, struct path_prefix *prefix) { struct path_prefix this_prefix; this_prefix.prev = prefix; - while (size) { - int namelen = strlen(buffer)+1; + while (tree->size) { + const char *name; + const unsigned char *sha1; + unsigned mode; void *eltbuf; char elttype[20]; unsigned long eltsize; - unsigned char *sha1 = buffer + namelen; - char *path = strchr(buffer, ' ') + 1; - unsigned int mode; - if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1) - die("corrupt 'tree' file"); - buffer = sha1 + 20; - size -= namelen + 20; + sha1 = tree_entry_extract(tree, &name, &mode); + update_tree_entry(tree); eltbuf = read_sha1_file(sha1, elttype, &eltsize); if (!eltbuf) die("cannot read %s", sha1_to_hex(sha1)); - write_header(sha1, TYPEFLAG_AUTO, basedir, prefix, path, - mode, eltbuf, eltsize); - if (!strcmp(elttype, "tree")) { - this_prefix.name = path; - traverse_tree(eltbuf, eltsize, &this_prefix); - } else if (!strcmp(elttype, "blob") && !S_ISLNK(mode)) { + write_header(sha1, TYPEFLAG_AUTO, basedir, + prefix, name, mode, eltbuf, eltsize); + if (S_ISDIR(mode)) { + struct tree_desc subtree; + subtree.buf = eltbuf; + subtree.size = eltsize; + this_prefix.name = name; + traverse_tree(&subtree, &this_prefix); + } else if (!S_ISLNK(mode)) { write_blocked(eltbuf, eltsize); } free(eltbuf); } } -/* get commit time from committer line of commit object */ -time_t commit_time(void * buffer, unsigned long size) -{ - time_t result = 0; - char *p = buffer; - - while (size > 0) { - char *endp = memchr(p, '\n', size); - if (!endp || endp == p) - break; - *endp = '\0'; - if (endp - p > 10 && !memcmp(p, "committer ", 10)) { - char *nump = strrchr(p, '>'); - if (!nump) - break; - nump++; - result = strtoul(nump, &endp, 10); - if (*endp != ' ') - result = 0; - break; - } - size -= endp - p - 1; - p = endp + 1; - } - return result; -} - int main(int argc, char **argv) { unsigned char sha1[20]; - unsigned char commit_sha1[20]; - void *buffer; - unsigned long size; + struct commit *commit; + struct tree_desc tree; + + setup_git_directory(); switch (argc) { case 3: @@ -420,23 +391,21 @@ int main(int argc, char **argv) usage(tar_tree_usage); } - buffer = read_object_with_reference(sha1, "commit", &size, commit_sha1); - if (buffer) { - write_global_extended_header(commit_sha1); - archive_time = commit_time(buffer, size); - free(buffer); + commit = lookup_commit_reference(sha1); + if (commit) { + write_global_extended_header(commit->object.sha1); + archive_time = commit->date; } - buffer = read_object_with_reference(sha1, "tree", &size, NULL); - if (!buffer) + tree.buf = read_object_with_reference(sha1, "tree", &tree.size, NULL); + if (!tree.buf) die("not a reference to a tag, commit or tree object: %s", sha1_to_hex(sha1)); if (!archive_time) archive_time = time(NULL); if (basedir) - write_header("0", TYPEFLAG_DIR, NULL, NULL, basedir, 040755, - NULL, 0); - traverse_tree(buffer, size, NULL); - free(buffer); + write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL, + basedir, 040777, NULL, 0); + traverse_tree(&tree, NULL); write_trailer(); return 0; }