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>
This commit is contained in:
Franck Bui-Huu 2006-09-07 15:12:04 +02:00 committed by Junio C Hamano
parent efd8696cd7
commit ec06bff5e6
3 changed files with 30 additions and 0 deletions

View File

@ -41,5 +41,6 @@ extern void parse_pathspec_arg(const char **pathspec,
* Archive-format specific backends. * Archive-format specific backends.
*/ */
extern int write_tar_archive(struct archiver_args *); extern int write_tar_archive(struct archiver_args *);
extern int write_zip_archive(struct archiver_args *);
#endif /* ARCHIVE_H */ #endif /* ARCHIVE_H */

View File

@ -16,6 +16,7 @@ static const char archive_usage[] = \
struct archiver archivers[] = { struct archiver archivers[] = {
{ .name = "tar", .write_archive = write_tar_archive }, { .name = "tar", .write_archive = write_tar_archive },
{ .name = "zip", .write_archive = write_zip_archive },
}; };
static int run_remote_archiver(struct archiver *ar, int argc, static int run_remote_archiver(struct archiver *ar, int argc,

View File

@ -8,6 +8,7 @@
#include "tree.h" #include "tree.h"
#include "quote.h" #include "quote.h"
#include "builtin.h" #include "builtin.h"
#include "archive.h"
static const char zip_tree_usage[] = static const char zip_tree_usage[] =
"git-zip-tree [-0|...|-9] <tree-ish> [ <base> ]"; "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; 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;
}