kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-cat-file: Small refactor of cmd_cat_file 

I separated the logic of parsing the arguments from the logic of fetching and
outputting the data. cat_one_file now does the latter.

Signed-off-by: Adam Roben <aroben@apple.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Adam Roben 2008-04-23 15:17:44 -04:00 committed by Junio C Hamano
parent b335d3f121
commit 9cf71b176c
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builtin-cat-file.c
View File

@ -76,31 +76,16 @@ static void pprint_tag(const unsigned char *sha1, const char *buf, unsigned long
write_or_die(1, cp, endp - cp); write_or_die(1, cp, endp - cp);
} }


int cmd_cat_file(int argc, const char **argv, const char *prefix) static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
enum object_type type; enum object_type type;
void *buf; void *buf;
unsigned long size; unsigned long size;
int opt;
const char *exp_type, *obj_name;

git_config(git_default_config);
if (argc != 3)
usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
exp_type = argv[1];
obj_name = argv[2];


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


opt = 0;
if ( exp_type[0] == '-' ) {
opt = exp_type[1];
if ( !opt || exp_type[2] )
opt = -1; /* Not a single character option */
}

buf = NULL; buf = NULL;
switch (opt) { switch (opt) {
case 't': case 't':
@ -157,3 +142,24 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
write_or_die(1, buf, size); write_or_die(1, buf, size);
return 0; return 0;
} }

int cmd_cat_file(int argc, const char **argv, const char *prefix)
{
int opt;
const char *exp_type, *obj_name;

git_config(git_default_config);
if (argc != 3)
usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
exp_type = argv[1];
obj_name = argv[2];

opt = 0;
if ( exp_type[0] == '-' ) {
opt = exp_type[1];
if ( !opt || exp_type[2] )
opt = -1; /* Not a single character option */
}

return cat_one_file(opt, exp_type, obj_name);
}