Allow the user to control the verbosity of merge-recursive.

diff --git a/builtin-archive.c b/builtin-archive.c
index da3f71470570a149c168da6532a8e3946e303c59..32737d31621e8d1a900d944f97fcaae43d56a12e 100644 (file)
--- 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,
@@ -75,7 +72,7 @@ static int run_remote_archiver(const char *remote, int argc,
                die("git-archive: expected a flush");
 
        /* Now, start reading from fd[0] and spit it out to stdout */
-       rv = recv_sideband("archive", fd[0], 1, 2, buf, sizeof(buf));
+       rv = recv_sideband("archive", fd[0], 1, 2);
        close(fd[0]);
        rv |= finish_connect(pid);
 
@@ -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;
@@ -145,17 +144,6 @@ void parse_treeish_arg(const char **argv, struct archiver_args *ar_args,
        ar_args->time = archive_time;
 }
 
-static const char *default_parse_extra(struct archiver *ar,
-                                      const char **argv)
-{
-       static char msg[64];
-
-       snprintf(msg, sizeof(msg) - 4, "'%s' format does not handle %s",
-                ar->name, *argv);
-
-       return strcat(msg, "...");
-}
-
 int parse_archive_args(int argc, const char **argv, struct archiver *ar)
 {
        const char *extra_argv[MAX_EXTRA_ARGS];
@@ -208,7 +196,8 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
 
        if (extra_argc) {
                if (!ar->parse_extra)
-                       die("%s", default_parse_extra(ar, extra_argv));
+                       die("'%s' format does not handle %s",
+                           ar->name, extra_argv[0]);
                ar->args.extra = ar->parse_extra(extra_argc, extra_argv);
        }
        ar->args.verbose = verbose;
@@ -258,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);