return len;
}
-static void write_header(const char *, const char *, struct path_prefix *,
+static void write_header(const char *, char, const char *, struct path_prefix *,
const char *, unsigned int, unsigned long);
/* stores a pax extended header directly in the block buffer */
struct path_prefix *prefix,
const char *path, unsigned int namelen)
{
- char *records, *p;
+ char *p;
unsigned int size = 1 + 6 + namelen + 1;
if (size > 9)
size++;
size++;
if (size > RECORDSIZE)
die("tar-tree: extended header too big, wtf?");
- write_header(NULL, NULL, NULL, headerfilename, 0100600, size);
-
- records = block + offset;
- memset(records, 0, RECORDSIZE);
+ write_header(NULL, 'x', NULL, NULL, headerfilename, 0100600, size);
+ p = block + offset;
+ memset(p, 0, RECORDSIZE);
offset += RECORDSIZE;
- p = records;
append_long(&p, size);
append_string(&p, " path=");
append_path(&p, is_dir, basepath, prefix, path);
write_if_needed();
}
+static void write_global_extended_header(const char *sha1)
+{
+ char *p;
+ write_header(NULL, 'g', NULL, NULL, "pax_global_header", 0, 52);
+ p = block + offset;
+ memset(p, 0, RECORDSIZE);
+ offset += RECORDSIZE;
+ append_long(&p, 52); /* 2 + 9 + 40 + 1 */
+ append_string(&p, " comment=");
+ append_string(&p, sha1_to_hex(sha1));
+ append_char(&p, '\n');
+ write_if_needed();
+}
+
/* stores a ustar header directly in the block buffer */
-static void write_header(const char *sha1, const char *basepath,
+static void write_header(const char *sha1, char typeflag, const char *basepath,
struct path_prefix *prefix, const char *path,
unsigned int mode, unsigned long size)
{
sprintf(&header[124], "%011lo", S_ISDIR(mode) ? 0 : size);
sprintf(&header[136], "%011lo", archive_time);
- /* typeflag */
- if (!sha1)
- header[156] = 'x'; /* extended header */
- else
- header[156] = S_ISDIR(mode) ? '5' : '0';
+ header[156] = typeflag;
memcpy(&header[257], "ustar", 6);
memcpy(&header[263], "00", 2);
eltbuf = read_sha1_file(sha1, elttype, &eltsize);
if (!eltbuf)
die("cannot read %s", sha1_to_hex(sha1));
- write_header(sha1, basedir, prefix, path, mode, eltsize);
+ write_header(sha1, S_ISDIR(mode) ? '5' : '0', basedir,
+ prefix, path, mode, eltsize);
if (!strcmp(elttype, "tree")) {
this_prefix.name = path;
traverse_tree(eltbuf, eltsize, &this_prefix);
}
/* get commit time from committer line of commit object */
-time_t commit_time(const unsigned char *sha1)
+time_t commit_time(void * buffer, unsigned long size)
{
- char type[20];
- void *buffer;
- unsigned long size;
time_t result = 0;
+ char *p = buffer;
- buffer = read_sha1_file(sha1, type, &size);
- if (buffer) {
- 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;
+ 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;
- }
- size -= endp - p - 1;
- p = endp + 1;
+ nump++;
+ result = strtoul(nump, &endp, 10);
+ if (*endp != ' ')
+ result = 0;
+ break;
}
- free(buffer);
+ 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;
- unsigned char tree_sha1[20];
switch (argc) {
case 3:
basedir = argv[2];
/* FALLTHROUGH */
case 2:
- if (get_sha1_hex(argv[1], sha1) < 0)
+ if (get_sha1(argv[1], sha1) < 0)
usage(tar_tree_usage);
break;
default:
if (!sha1_file_directory)
sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
- buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, tree_sha1);
+ 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);
+ }
+ buffer = read_object_with_reference(sha1, "tree", &size, NULL);
if (!buffer)
- die("unable to read sha1 file");
- if (memcmp(sha1, tree_sha1, 20)) /* is sha1 a commit object? */
- archive_time = commit_time(sha1);
+ 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", NULL, NULL, basedir, 040755, 0);
+ write_header("0", '5', NULL, NULL, basedir, 040755, 0);
traverse_tree(buffer, size, NULL);
free(buffer);
write_trailer();