archive: add write_archive()

Both archive and upload-archive have to parse command line arguments and
then call the archiver specific write function.  Move the duplicate code
to a new function, write_archive().

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive.c b/archive.c
index b8b45bad77230b0258622e993dbbac3a20e3716c..75eb2577602da1f2cd56ca416265c5efb14a96b1 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -155,3 +155,21 @@ int write_archive_entries(struct archiver_args *args,
                err = 0;
        return err;
 }
+
+int write_archive(int argc, const char **argv, const char *prefix,
+               int setup_prefix)
+{
+       const struct archiver *ar = NULL;
+       struct archiver_args args;
+       int tree_idx;
+
+       tree_idx = parse_archive_args(argc, argv, &ar, &args);
+       if (setup_prefix && prefix == NULL)
+               prefix = setup_git_directory();
+
+       argv += tree_idx;
+       parse_treeish_arg(argv, &args, prefix);
+       parse_pathspec_arg(argv + 1, &args);
+
+       return ar->write_archive(&args);
+}

diff --git a/archive.h b/archive.h
index 4a02371f374a159604ab55102be5ba5b9d3f7cd2..6b5fe5af4534117a8ece6da25ab3dc3cd5ce9236 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -41,5 +41,6 @@ extern int write_tar_archive(struct archiver_args *);
 extern int write_zip_archive(struct archiver_args *);
 
 extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
+extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix);
 
 #endif /* ARCHIVE_H */

diff --git a/builtin-archive.c b/builtin-archive.c
index df9772469681285d69f968b59172c4aaee2eb679..502b339e6bb0080799a552a03bad172b99f93960 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -232,9 +232,6 @@ static const char *extract_remote_arg(int *ac, const char **av)
 
 int cmd_archive(int argc, const char **argv, const char *prefix)
 {
-       const struct archiver *ar = NULL;
-       struct archiver_args args;
-       int tree_idx;
        const char *remote = NULL;
 
        remote = extract_remote_arg(&argc, argv);
@@ -243,13 +240,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
 
        setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
 
-       tree_idx = parse_archive_args(argc, argv, &ar, &args);
-       if (prefix == NULL)
-               prefix = setup_git_directory();
-
-       argv += tree_idx;
-       parse_treeish_arg(argv, &args, prefix);
-       parse_pathspec_arg(argv + 1, &args);
-
-       return ar->write_archive(&args);
+       return write_archive(argc, argv, prefix, 1);
 }

diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c
index 13a6c6203eff7d8dc96a56fa5709dc9eb69da0a6..cc37b36d996cfc293987a30e23725d28bd635f57 100644 (file)
--- a/builtin-upload-archive.c
+++ b/builtin-upload-archive.c
@@ -19,12 +19,9 @@ static const char lostchild[] =
 
 static int run_upload_archive(int argc, const char **argv, const char *prefix)
 {
-       const struct archiver *ar;
-       struct archiver_args args;
        const char *sent_argv[MAX_ARGS];
        const char *arg_cmd = "argument ";
        char *p, buf[4096];
-       int treeish_idx;
        int sent_argc;
        int len;
 
@@ -66,12 +63,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)
        sent_argv[sent_argc] = NULL;
 
        /* parse all options sent by the client */
-       treeish_idx = parse_archive_args(sent_argc, sent_argv, &ar, &args);
-
-       parse_treeish_arg(sent_argv + treeish_idx, &args, prefix);
-       parse_pathspec_arg(sent_argv + treeish_idx + 1, &args);
-
-       return ar->write_archive(&args);
+       return write_archive(sent_argc, sent_argv, prefix, 0);
 }
 
 static void error_clnt(const char *fmt, ...)