summaryrefslogtreecommitdiff
path: root/archive.h
diff options
context:
space:
mode:
Diffstat (limited to 'archive.h')
-rw-r--r--archive.h56
1 files changed, 29 insertions, 27 deletions
diff --git a/archive.h b/archive.h
index 6838dc788f..4a791e1fed 100644
--- a/archive.h
+++ b/archive.h
@@ -1,45 +1,47 @@
#ifndef ARCHIVE_H
#define ARCHIVE_H
-#define MAX_EXTRA_ARGS 32
-#define MAX_ARGS (MAX_EXTRA_ARGS + 32)
+#include "pathspec.h"
struct archiver_args {
const char *base;
+ size_t baselen;
struct tree *tree;
const unsigned char *commit_sha1;
+ const struct commit *commit;
time_t time;
- const char **pathspec;
+ struct pathspec pathspec;
unsigned int verbose : 1;
- void *extra;
+ unsigned int worktree_attributes : 1;
+ unsigned int convert : 1;
+ int compression_level;
};
-typedef int (*write_archive_fn_t)(struct archiver_args *);
-
-typedef void *(*parse_extra_args_fn_t)(int argc, const char **argv);
-
+#define ARCHIVER_WANT_COMPRESSION_LEVELS 1
+#define ARCHIVER_REMOTE 2
struct archiver {
const char *name;
- struct archiver_args args;
- write_archive_fn_t write_archive;
- parse_extra_args_fn_t parse_extra;
+ int (*write_archive)(const struct archiver *, struct archiver_args *);
+ unsigned flags;
+ void *data;
};
+extern void register_archiver(struct archiver *);
+
+extern void init_tar_archiver(void);
+extern void init_zip_archiver(void);
+
+typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
+ const unsigned char *sha1,
+ const char *path, size_t pathlen,
+ unsigned int mode);
+
+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, const char *name_hint, int remote);
-extern int parse_archive_args(int argc,
- const char **argv,
- struct archiver *ar);
-
-extern void parse_treeish_arg(const char **treeish,
- struct archiver_args *ar_args,
- const char *prefix);
-
-extern void parse_pathspec_arg(const char **pathspec,
- struct archiver_args *args);
-/*
- * Archive-format specific backends.
- */
-extern int write_tar_archive(struct archiver_args *);
-extern int write_zip_archive(struct archiver_args *);
-extern void *parse_extra_zip_args(int argc, const char **argv);
+const char *archive_format_from_filename(const char *filename);
+extern void *sha1_file_to_archive(const struct archiver_args *args,
+ const char *path, const unsigned char *sha1,
+ unsigned int mode, enum object_type *type,
+ unsigned long *sizep);
#endif /* ARCHIVE_H */