X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-archive.c;h=32737d31621e8d1a900d944f97fcaae43d56a12e;hb=8860fd42fcf5a7853f7d7c2198793183320293ff;hp=9177379122ea29152e1213cc533f7cd7c569f8d3;hpb=9ee93dceb5dbef8052b0abde3eea94181bd9d95b;p=git.git

diff --git a/builtin-archive.c b/builtin-archive.c
index 917737912..32737d316 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -2,7 +2,6 @@
  * Copyright (c) 2006 Franck Bui-Huu
  * Copyright (c) 2006 Rene Scharfe
  */
-#include <time.h>
 #include "cache.h"
 #include "builtin.h"
 #include "archive.h"
@@ -15,16 +14,14 @@
 static const char archive_usage[] = \
 "git-archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]";
 
-struct archiver archivers[] = {
-	{
-		.name		= "tar",
-		.write_archive	= write_tar_archive,
-	},
-	{
-		.name		= "zip",
-		.write_archive	= write_zip_archive,
-		.parse_extra	= parse_extra_zip_args,
-	},
+static struct archiver_desc
+{
+	const char *name;
+	write_archive_fn_t write_archive;
+	parse_extra_args_fn_t parse_extra;
+} archivers[] = {
+	{ "tar", write_tar_archive, NULL },
+	{ "zip", write_zip_archive, parse_extra_zip_args },
 };
 
 static int run_remote_archiver(const char *remote, int argc,
@@ -88,7 +85,10 @@ static int init_archiver(const char *name, struct archiver *ar)
 
 	for (i = 0; i < ARRAY_SIZE(archivers); i++) {
 		if (!strcmp(name, archivers[i].name)) {
-			memcpy(ar, &archivers[i], sizeof(struct archiver));
+			memset(ar, 0, sizeof(*ar));
+			ar->name = archivers[i].name;
+			ar->write_archive = archivers[i].write_archive;
+			ar->parse_extra = archivers[i].parse_extra;
 			rv = 0;
 			break;
 		}
@@ -137,7 +137,6 @@ void parse_treeish_arg(const char **argv, struct archiver_args *ar_args,
 		if (err || !S_ISDIR(mode))
 			die("current working directory is untracked");
 
-		free(tree);
 		tree = parse_tree_indirect(tree_sha1);
 	}
 	ar_args->tree = tree;
@@ -248,7 +247,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
 	if (remote)
 		return run_remote_archiver(remote, argc, argv);
 
-	setlinebuf(stderr);
+	setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
 
 	memset(&ar, 0, sizeof(ar));
 	tree_idx = parse_archive_args(argc, argv, &ar);