tar-tree: Remove obsolete code

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 0 insertions, 214 deletions

diff --git a/tar-tree.c b/tar-tree.c
index 2be42fe6cb..11bbc81e36 100644
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -11,22 +11,13 @@
 #define RECORDSIZE	(512)
 #define BLOCKSIZE	(RECORDSIZE * 20)
 
-#define EXT_HEADER_PATH		1
-#define EXT_HEADER_LINKPATH	2
-
 static const char tar_tree_usage[] = "git-tar-tree <key> [basedir]";
 
 static char block[BLOCKSIZE];
 static unsigned long offset;
 
-static const char *basedir;
 static time_t archive_time;
 
-struct path_prefix {
-	struct path_prefix *prev;
-	const char *name;
-};
-
 /* tries hard to write, either succeeds or dies in the attempt */
 static void reliable_write(void *buf, unsigned long size)
 {
@@ -247,122 +238,6 @@ static void write_entry(const unsigned char *sha1, struct strbuf *path,
 		write_blocked(buffer, size);
 }
 
-static void append_string(char **p, const char *s)
-{
-	unsigned int len = strlen(s);
-	memcpy(*p, s, len);
-	*p += len;
-}
-
-static void append_char(char **p, char c)
-{
-	**p = c;
-	*p += 1;
-}
-
-static void append_path_prefix(char **buffer, struct path_prefix *prefix)
-{
-	if (!prefix)
-		return;
-	append_path_prefix(buffer, prefix->prev);
-	append_string(buffer, prefix->name);
-	append_char(buffer, '/');
-}
-
-static unsigned int path_prefix_len(struct path_prefix *prefix)
-{
-	if (!prefix)
-		return 0;
-	return path_prefix_len(prefix->prev) + strlen(prefix->name) + 1;
-}
-
-static void append_path(char **p, int is_dir, const char *basepath,
-                        struct path_prefix *prefix, const char *path)
-{
-	if (basepath) {
-		append_string(p, basepath);
-		append_char(p, '/');
-	}
-	append_path_prefix(p, prefix);
-	append_string(p, path);
-	if (is_dir)
-		append_char(p, '/');
-}
-
-static unsigned int path_len(int is_dir, const char *basepath,
-                             struct path_prefix *prefix, const char *path)
-{
-	unsigned int len = 0;
-	if (basepath)
-		len += strlen(basepath) + 1;
-	len += path_prefix_len(prefix) + strlen(path);
-	if (is_dir)
-		len++;
-	return len;
-}
-
-static void append_extended_header_prefix(char **p, unsigned int size,
-                                          const char *keyword)
-{
-	int len = sprintf(*p, "%u %s=", size, keyword);
-	*p += len;
-}
-
-static unsigned int extended_header_len(const char *keyword,
-                                        unsigned int valuelen)
-{
-	/* "%u %s=%s\n" */
-	unsigned int len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
-	if (len > 9)
-		len++;
-	if (len > 99)
-		len++;
-	return len;
-}
-
-static void append_extended_header(char **p, const char *keyword,
-                                   const char *value, unsigned int len)
-{
-	unsigned int size = extended_header_len(keyword, len);
-	append_extended_header_prefix(p, size, keyword);
-	memcpy(*p, value, len);
-	*p += len;
-	append_char(p, '\n');
-}
-
-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 */
-static void write_extended_header(const char *headerfilename, int is_dir,
-                                  unsigned int flags, const char *basepath,
-                                  struct path_prefix *prefix,
-                                  const char *path, unsigned int namelen,
-                                  void *content, unsigned int contentsize)
-{
-	char *buffer, *p;
-	unsigned int pathlen, size, linkpathlen = 0;
-
-	size = pathlen = extended_header_len("path", namelen);
-	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);
-
-	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');
-	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 unsigned char *sha1)
 {
 	struct strbuf ext_header;
@@ -373,95 +248,6 @@ static void write_global_extended_header(const unsigned char *sha1)
 	free(ext_header.buf);
 }
 
-/* stores a ustar header directly in the block buffer */
-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 *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 > 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_to_hex(sha1));
-		write_extended_header(headerfilename, S_ISDIR(mode),
-		                      ext_header, basepath, prefix, path,
-		                      namelen, buffer, size);
-	}
-
-	header = get_record();
-
-	if (ext_header) {
-		sprintf(header, "%s.data", sha1_to_hex(sha1));
-	} else {
-		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 |= 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? */
-	sprintf(&header[108], "%07o", 0);	/* uid */
-	sprintf(&header[116], "%07o", 0);	/* gid */
-	strncpy(&header[265], "git", 31);	/* uname */
-	strncpy(&header[297], "git", 31);	/* gname */
-
-	if (S_ISDIR(mode) || S_ISLNK(mode))
-		size = 0;
-	sprintf(&header[124], "%011lo", size);
-	sprintf(&header[136], "%011lo", archive_time);
-
-	header[156] = typeflag;
-
-	memcpy(&header[257], "ustar", 6);
-	memcpy(&header[263], "00", 2);
-
-	sprintf(&header[329], "%07o", 0);	/* devmajor */
-	sprintf(&header[337], "%07o", 0);	/* devminor */
-
-	memset(&header[148], ' ', 8);
-	for (i = 0; i < RECORDSIZE; i++)
-		checksum += header[i];
-	sprintf(&header[148], "%07o", checksum & 0x1fffff);
-
-	write_if_needed();
-}
-
 static void traverse_tree(struct tree_desc *tree, struct strbuf *path)
 {
 	int pathlen = path->len;