summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Bui-Huu <vagabon.xyz@gmail.com>2006-09-07 13:12:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-09 18:57:37 (GMT)
commitec06bff5e6f76b46c22a3b2c97452568f088fa3c (patch)
tree5002cdb4a2b53f2767ce36fa8b1bde59803f049a
parentefd8696cd7ccfa5042ef710e89fe0d10efdcd085 (diff)
downloadgit-ec06bff5e6f76b46c22a3b2c97452568f088fa3c.zip
git-ec06bff5e6f76b46c22a3b2c97452568f088fa3c.tar.gz
git-ec06bff5e6f76b46c22a3b2c97452568f088fa3c.tar.bz2
git-archive: wire up ZIP format.
Again, this is based on Rene Scharfe's earlier patch, but uses the archiver support introduced by the previous patch. Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com> Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--archive.h1
-rw-r--r--builtin-archive.c1
-rw-r--r--builtin-zip-tree.c28
3 files changed, 30 insertions, 0 deletions
diff --git a/archive.h b/archive.h
index 5c3f29b..f3d344b 100644
--- a/archive.h
+++ b/archive.h
@@ -41,5 +41,6 @@ extern void parse_pathspec_arg(const char **pathspec,
* Archive-format specific backends.
*/
extern int write_tar_archive(struct archiver_args *);
+extern int write_zip_archive(struct archiver_args *);
#endif /* ARCHIVE_H */
diff --git a/builtin-archive.c b/builtin-archive.c
index c6423b9..651d1bf 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -16,6 +16,7 @@ static const char archive_usage[] = \
struct archiver archivers[] = {
{ .name = "tar", .write_archive = write_tar_archive },
+ { .name = "zip", .write_archive = write_zip_archive },
};
static int run_remote_archiver(struct archiver *ar, int argc,
diff --git a/builtin-zip-tree.c b/builtin-zip-tree.c
index 1c1f683..3afb7bd 100644
--- a/builtin-zip-tree.c
+++ b/builtin-zip-tree.c
@@ -8,6 +8,7 @@
#include "tree.h"
#include "quote.h"
#include "builtin.h"
+#include "archive.h"
static const char zip_tree_usage[] =
"git-zip-tree [-0|...|-9] <tree-ish> [ <base> ]";
@@ -351,3 +352,30 @@ int cmd_zip_tree(int argc, const char **argv, const char *prefix)
return 0;
}
+
+int write_zip_archive(struct archiver_args *args)
+{
+ int plen = strlen(args->base);
+
+ dos_time(&args->time, &zip_date, &zip_time);
+
+ zip_dir = xmalloc(ZIP_DIRECTORY_MIN_SIZE);
+ zip_dir_size = ZIP_DIRECTORY_MIN_SIZE;
+
+ if (args->base && plen > 0 && args->base[plen - 1] == '/') {
+ char *base = strdup(args->base);
+ int baselen = strlen(base);
+
+ while (baselen > 0 && base[baselen - 1] == '/')
+ base[--baselen] = '\0';
+ write_zip_entry(args->tree->object.sha1, "", 0, base, 040777, 0);
+ free(base);
+ }
+ read_tree_recursive(args->tree, args->base, plen, 0,
+ args->pathspec, write_zip_entry);
+ write_zip_trailer(args->commit_sha1);
+
+ free(zip_dir);
+
+ return 0;
+}