X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tar-tree.c;h=970c4bb54e148282a89f1249a96deca880bccafd;hb=1f5881bb5f4da97d0bb23024ae91079137326c7e;hp=e99adc7dd781cf46efbed82221bf62975a4a3996;hpb=08f09dac0126482005013e4f9a108de8c7d42f43;p=git.git diff --git a/tar-tree.c b/tar-tree.c index e99adc7d..970c4bb5 100644 --- a/tar-tree.c +++ b/tar-tree.c @@ -1,3 +1,6 @@ +/* + * Copyright (c) 2005 Rene Scharfe + */ #include #include "cache.h" @@ -6,11 +9,15 @@ #define TYPEFLAG_AUTO '\0' #define TYPEFLAG_REG '0' +#define TYPEFLAG_LNK '2' #define TYPEFLAG_DIR '5' #define TYPEFLAG_GLOBAL_HEADER 'g' #define TYPEFLAG_EXT_HEADER 'x' -static const char *tar_tree_usage = "tar-tree [basedir]"; +#define EXT_HEADER_PATH 1 +#define EXT_HEADER_LINKPATH 2 + +static const char tar_tree_usage[] = "git-tar-tree [basedir]"; static char block[BLOCKSIZE]; static unsigned long offset; @@ -33,9 +40,9 @@ static void reliable_write(void *buf, unsigned long size) 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; @@ -66,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(); } } @@ -198,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 */ @@ -208,23 +212,30 @@ static void write_extended_header(const char *headerfilename, int is_dir, const char *path, unsigned int namelen, void *content, unsigned int contentsize) { - char *p; - unsigned int pathlen, size; + char *buffer, *p; + unsigned int pathlen, size, linkpathlen = 0; size = pathlen = extended_header_len("path", namelen); - if (size > RECORDSIZE) - die("tar-tree: extended header too big, wtf?"); + if (flags & EXT_HEADER_LINKPATH) { + linkpathlen = extended_header_len("linkpath", contentsize); + size += linkpathlen; + } write_header(NULL, TYPEFLAG_EXT_HEADER, NULL, NULL, headerfilename, 0100600, NULL, size); - p = get_record(); + buffer = p = malloc(size); + if (!buffer) + die("git-tar-tree: %s", strerror(errno)); append_extended_header_prefix(&p, pathlen, "path"); append_path(&p, is_dir, basepath, prefix, path); append_char(&p, '\n'); - write_if_needed(); + if (flags & EXT_HEADER_LINKPATH) + append_extended_header(&p, "linkpath", content, contentsize); + write_blocked(buffer, size); + 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; @@ -239,43 +250,63 @@ 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) { unsigned int namelen; - char *p, *header = NULL; + char *header = NULL; unsigned int checksum = 0; int i; + unsigned int ext_header = 0; if (typeflag == TYPEFLAG_AUTO) { if (S_ISDIR(mode)) typeflag = TYPEFLAG_DIR; + else if (S_ISLNK(mode)) + typeflag = TYPEFLAG_LNK; else typeflag = TYPEFLAG_REG; } namelen = path_len(S_ISDIR(mode), basepath, prefix, path); - if (namelen > 500) { - die("tar-tree: name too log of object %s\n", sha1_to_hex(sha1)); - } else if (namelen > 100) { - char *sha1_hex = sha1_to_hex(sha1); + if (namelen > 100) + ext_header |= EXT_HEADER_PATH; + if (typeflag == TYPEFLAG_LNK && size > 100) + ext_header |= EXT_HEADER_LINKPATH; + + /* the extended header must be written before the normal one */ + if (ext_header) { char headerfilename[51]; - sprintf(headerfilename, "%s.paxheader", sha1_hex); - /* the extended header must be written before the normal one */ + sprintf(headerfilename, "%s.paxheader", sha1_to_hex(sha1)); write_extended_header(headerfilename, S_ISDIR(mode), - 0, basepath, prefix, path, + ext_header, basepath, prefix, path, namelen, buffer, size); + } - header = get_record(); - sprintf(header, "%s.data", sha1_hex); + header = get_record(); + + if (ext_header) { + sprintf(header, "%s.data", sha1_to_hex(sha1)); } else { - p = header = get_record(); + char *p = header; append_path(&p, S_ISDIR(mode), basepath, prefix, path); } + if (typeflag == TYPEFLAG_LNK) { + if (ext_header & EXT_HEADER_LINKPATH) { + sprintf(&header[157], "see %s.paxheader", + sha1_to_hex(sha1)); + } else { + if (buffer) + strncpy(&header[157], buffer, size); + } + } + if (S_ISDIR(mode)) mode |= 0755; /* GIT doesn't store permissions of dirs */ + if (S_ISLNK(mode)) + mode |= 0777; /* ... nor of symlinks */ sprintf(&header[100], "%07o", mode & 07777); /* XXX: should we provide more meaningful info here? */ @@ -284,7 +315,9 @@ static void write_header(const char *sha1, char typeflag, const char *basepath, strncpy(&header[265], "git", 31); /* uname */ strncpy(&header[297], "git", 31); /* gname */ - sprintf(&header[124], "%011lo", S_ISDIR(mode) ? 0 : size); + if (S_ISDIR(mode) || S_ISLNK(mode)) + size = 0; + sprintf(&header[124], "%011lo", size); sprintf(&header[136], "%011lo", archive_time); header[156] = typeflag; @@ -292,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++) @@ -320,6 +353,8 @@ static void traverse_tree(void *buffer, unsigned long size, 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; @@ -331,7 +366,7 @@ static void traverse_tree(void *buffer, unsigned long size, if (!strcmp(elttype, "tree")) { this_prefix.name = path; traverse_tree(eltbuf, eltsize, &this_prefix); - } else if (!strcmp(elttype, "blob")) { + } else if (!strcmp(elttype, "blob") && !S_ISLNK(mode)) { write_blocked(eltbuf, eltsize); } free(eltbuf); @@ -339,7 +374,7 @@ static void traverse_tree(void *buffer, unsigned long size, } /* get commit time from committer line of commit object */ -time_t commit_time(void * buffer, unsigned long size) +static time_t commit_time(void * buffer, unsigned long size) { time_t result = 0; char *p = buffer; @@ -384,10 +419,6 @@ int main(int argc, char **argv) usage(tar_tree_usage); } - sha1_file_directory = getenv(DB_ENVIRONMENT); - if (!sha1_file_directory) - sha1_file_directory = DEFAULT_DB_ENVIRONMENT; - buffer = read_object_with_reference(sha1, "commit", &size, commit_sha1); if (buffer) { write_global_extended_header(commit_sha1); @@ -401,8 +432,8 @@ int main(int argc, char **argv) if (!archive_time) archive_time = time(NULL); if (basedir) - write_header("0", TYPEFLAG_DIR, NULL, NULL, basedir, 040755, - NULL, 0); + write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL, + basedir, 040755, NULL, 0); traverse_tree(buffer, size, NULL); free(buffer); write_trailer();