Skip to content

Commit

Permalink
archive: move parameter parsing code to archive.c
Browse files Browse the repository at this point in the history 
write_archive() in archive.c is the only callsite for the command line
parsing functions located in builtin-archive.c.  Move them to the place
where they are used, un-export them and make them static, as hinted at
by Stephan.

Cc: Stephan Beyer <[email protected]>
Signed-off-by: Rene Scharfe <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
@gitster
Rene Scharfe authored and gitster committed Jul 26, 2008
1 parent 6e94e68 commit c088543
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 145 deletions.
137 changes: 137 additions & 0 deletions archive.c
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
#include "cache.h"
#include "commit.h"
#include "tree-walk.h"
#include "attr.h"
#include "archive.h"

static const char archive_usage[] = \
"git archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]";

#define USES_ZLIB_COMPRESSION 1

const struct archiver archivers[] = {
{ "tar", write_tar_archive },
{ "zip", write_zip_archive, USES_ZLIB_COMPRESSION },
};

static void format_subst(const struct commit *commit,
const char *src, size_t len,
struct strbuf *buf)
Expand Down Expand Up @@ -156,6 +167,132 @@ int write_archive_entries(struct archiver_args *args,
return err;
}

static const struct archiver *lookup_archiver(const char *name)
{
int i;

for (i = 0; i < ARRAY_SIZE(archivers); i++) {
if (!strcmp(name, archivers[i].name))
return &archivers[i];
}
return NULL;
}

static void parse_pathspec_arg(const char **pathspec,
struct archiver_args *ar_args)
{
ar_args->pathspec = get_pathspec(ar_args->base, pathspec);
}

static void parse_treeish_arg(const char **argv,
struct archiver_args *ar_args, const char *prefix)
{
const char *name = argv[0];
const unsigned char *commit_sha1;
time_t archive_time;
struct tree *tree;
const struct commit *commit;
unsigned char sha1[20];

if (get_sha1(name, sha1))
die("Not a valid object name");

commit = lookup_commit_reference_gently(sha1, 1);
if (commit) {
commit_sha1 = commit->object.sha1;
archive_time = commit->date;
} else {
commit_sha1 = NULL;
archive_time = time(NULL);
}

tree = parse_tree_indirect(sha1);
if (tree == NULL)
die("not a tree object");

if (prefix) {
unsigned char tree_sha1[20];
unsigned int mode;
int err;

err = get_tree_entry(tree->object.sha1, prefix,
tree_sha1, &mode);
if (err || !S_ISDIR(mode))
die("current working directory is untracked");

tree = parse_tree_indirect(tree_sha1);
}
ar_args->tree = tree;
ar_args->commit_sha1 = commit_sha1;
ar_args->commit = commit;
ar_args->time = archive_time;
}

static int parse_archive_args(int argc, const char **argv,
const struct archiver **ar, struct archiver_args *args)
{
const char *format = "tar";
const char *base = "";
int compression_level = -1;
int verbose = 0;
int i;

for (i = 1; i < argc; i++) {
const char *arg = argv[i];

if (!strcmp(arg, "--list") || !strcmp(arg, "-l")) {
for (i = 0; i < ARRAY_SIZE(archivers); i++)
printf("%s\n", archivers[i].name);
exit(0);
}
if (!strcmp(arg, "--verbose") || !strcmp(arg, "-v")) {
verbose = 1;
continue;
}
if (!prefixcmp(arg, "--format=")) {
format = arg + 9;
continue;
}
if (!prefixcmp(arg, "--prefix=")) {
base = arg + 9;
continue;
}
if (!strcmp(arg, "--")) {
i++;
break;
}
if (arg[0] == '-' && isdigit(arg[1]) && arg[2] == '\0') {
compression_level = arg[1] - '0';
continue;
}
if (arg[0] == '-')
die("Unknown argument: %s", arg);
break;
}

/* We need at least one parameter -- tree-ish */
if (argc - 1 < i)
usage(archive_usage);
*ar = lookup_archiver(format);
if (!*ar)
die("Unknown archive format '%s'", format);

args->compression_level = Z_DEFAULT_COMPRESSION;
if (compression_level != -1) {
if ((*ar)->flags & USES_ZLIB_COMPRESSION)
args->compression_level = compression_level;
else {
die("Argument not supported for format '%s': -%d",
format, compression_level);
}
}
args->verbose = verbose;
args->base = base;
args->baselen = strlen(base);

return i;
}

int write_archive(int argc, const char **argv, const char *prefix,
int setup_prefix)
{
Expand Down
8 changes: 0 additions & 8 deletions archive.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ struct archiver {
unsigned int flags;
};

extern int parse_archive_args(int argc, const char **argv, const struct archiver **ar, struct archiver_args *args);

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.
*/
Expand Down
137 changes: 0 additions & 137 deletions builtin-archive.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,9 @@
#include "cache.h"
#include "builtin.h"
#include "archive.h"
#include "commit.h"
#include "tree-walk.h"
#include "pkt-line.h"
#include "sideband.h"

static const char archive_usage[] = \
"git archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]";

#define USES_ZLIB_COMPRESSION 1

const struct archiver archivers[] = {
{ "tar", write_tar_archive },
{ "zip", write_zip_archive, USES_ZLIB_COMPRESSION },
};

static int run_remote_archiver(const char *remote, int argc,
const char **argv)
{
Expand Down Expand Up @@ -74,131 +62,6 @@ static int run_remote_archiver(const char *remote, int argc,
return !!rv;
}

static const struct archiver *lookup_archiver(const char *name)
{
int i;

for (i = 0; i < ARRAY_SIZE(archivers); i++) {
if (!strcmp(name, archivers[i].name))
return &archivers[i];
}
return NULL;
}

void parse_pathspec_arg(const char **pathspec, struct archiver_args *ar_args)
{
ar_args->pathspec = get_pathspec(ar_args->base, pathspec);
}

void parse_treeish_arg(const char **argv, struct archiver_args *ar_args,
const char *prefix)
{
const char *name = argv[0];
const unsigned char *commit_sha1;
time_t archive_time;
struct tree *tree;
const struct commit *commit;
unsigned char sha1[20];

if (get_sha1(name, sha1))
die("Not a valid object name");

commit = lookup_commit_reference_gently(sha1, 1);
if (commit) {
commit_sha1 = commit->object.sha1;
archive_time = commit->date;
} else {
commit_sha1 = NULL;
archive_time = time(NULL);
}

tree = parse_tree_indirect(sha1);
if (tree == NULL)
die("not a tree object");

if (prefix) {
unsigned char tree_sha1[20];
unsigned int mode;
int err;

err = get_tree_entry(tree->object.sha1, prefix,
tree_sha1, &mode);
if (err || !S_ISDIR(mode))
die("current working directory is untracked");

tree = parse_tree_indirect(tree_sha1);
}
ar_args->tree = tree;
ar_args->commit_sha1 = commit_sha1;
ar_args->commit = commit;
ar_args->time = archive_time;
}

int parse_archive_args(int argc, const char **argv, const struct archiver **ar,
struct archiver_args *args)
{
const char *format = "tar";
const char *base = "";
int compression_level = -1;
int verbose = 0;
int i;

for (i = 1; i < argc; i++) {
const char *arg = argv[i];

if (!strcmp(arg, "--list") || !strcmp(arg, "-l")) {
for (i = 0; i < ARRAY_SIZE(archivers); i++)
printf("%s\n", archivers[i].name);
exit(0);
}
if (!strcmp(arg, "--verbose") || !strcmp(arg, "-v")) {
verbose = 1;
continue;
}
if (!prefixcmp(arg, "--format=")) {
format = arg + 9;
continue;
}
if (!prefixcmp(arg, "--prefix=")) {
base = arg + 9;
continue;
}
if (!strcmp(arg, "--")) {
i++;
break;
}
if (arg[0] == '-' && isdigit(arg[1]) && arg[2] == '\0') {
compression_level = arg[1] - '0';
continue;
}
if (arg[0] == '-')
die("Unknown argument: %s", arg);
break;
}

/* We need at least one parameter -- tree-ish */
if (argc - 1 < i)
usage(archive_usage);
*ar = lookup_archiver(format);
if (!*ar)
die("Unknown archive format '%s'", format);

args->compression_level = Z_DEFAULT_COMPRESSION;
if (compression_level != -1) {
if ((*ar)->flags & USES_ZLIB_COMPRESSION)
args->compression_level = compression_level;
else {
die("Argument not supported for format '%s': -%d",
format, compression_level);
}
}
args->verbose = verbose;
args->base = base;
args->baselen = strlen(base);

return i;
}

static const char *extract_remote_arg(int *ac, const char **av)
{
int ix, iy, cnt = *ac;
Expand Down

0 comments on commit c088543

Please sign in to comment.