*/
#include <time.h>
#include "cache.h"
+#include "diff.h"
+#include "commit.h"
#define RECORDSIZE (512)
#define BLOCKSIZE (RECORDSIZE * 20)
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("git-tar-tree: %s", strerror(errno));
}
if (S_ISDIR(mode))
- mode |= 0755; /* GIT doesn't store permissions of dirs */
- if (S_ISLNK(mode))
- mode |= 0777; /* ... nor of symlinks */
+ mode |= 0777;
+ else if (S_ISREG(mode))
+ mode |= (mode & 0100) ? 0777 : 0666;
+ else if (S_ISLNK(mode))
+ mode |= 0777;
sprintf(&header[100], "%07o", mode & 07777);
/* XXX: should we provide more meaningful info here? */
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");
- if (S_ISDIR(mode) || S_ISREG(mode))
- mode |= (mode & 0100) ? 0777 : 0666;
- 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 */
-static 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:
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_gently(sha1, 1);
+ 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((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL,
- basedir, 040755, NULL, 0);
- traverse_tree(buffer, size, NULL);
- free(buffer);
+ basedir, 040777, NULL, 0);
+ traverse_tree(&tree, NULL);
write_trailer();
return 0;
}