Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / builtin-cat-file.c

diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 832cfd184a95bf61314d594b89160bdea37d7877..7441a56acdbefdd8044a406f4d756ce8a4f06644 100644 (file)
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -8,6 +8,10 @@
 #include "tag.h"
 #include "tree.h"
 #include "builtin.h"
+#include "parse-options.h"
+
+#define BATCH 1
+#define BATCH_CHECK 2
 
 static void pprint_tag(const unsigned char *sha1, const char *buf, unsigned long size)
 {
@@ -143,36 +147,53 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
        return 0;
 }
 
-static int batch_one_object(const char *obj_name)
+static int batch_one_object(const char *obj_name, int print_contents)
 {
        unsigned char sha1[20];
-       enum object_type type;
+       enum object_type type = 0;
        unsigned long size;
+       void *contents = contents;
 
        if (!obj_name)
           return 1;
 
        if (get_sha1(obj_name, sha1)) {
                printf("%s missing\n", obj_name);
+               fflush(stdout);
                return 0;
        }
 
-       type = sha1_object_info(sha1, &size);
-       if (type <= 0)
-               return 1;
+       if (print_contents == BATCH)
+               contents = read_sha1_file(sha1, &type, &size);
+       else
+               type = sha1_object_info(sha1, &size);
+
+       if (type <= 0) {
+               printf("%s missing\n", obj_name);
+               fflush(stdout);
+               return 0;
+       }
 
        printf("%s %s %lu\n", sha1_to_hex(sha1), typename(type), size);
+       fflush(stdout);
+
+       if (print_contents == BATCH) {
+               write_or_die(1, contents, size);
+               printf("\n");
+               fflush(stdout);
+               free(contents);
+       }
 
        return 0;
 }
 
-static int batch_objects(void)
+static int batch_objects(int print_contents)
 {
        struct strbuf buf;
 
        strbuf_init(&buf, 0);
        while (strbuf_getline(&buf, stdin, '\n') != EOF) {
-               int error = batch_one_object(buf.buf);
+               int error = batch_one_object(buf.buf, print_contents);
                if (error)
                        return error;
        }
@@ -180,74 +201,58 @@ static int batch_objects(void)
        return 0;
 }
 
-static const char cat_file_usage[] = "git-cat-file [ [-t|-s|-e|-p|<type>] <sha1> | --batch-check < <list_of_sha1s> ]";
+static const char * const cat_file_usage[] = {
+       "git cat-file [-t|-s|-e|-p|<type>] <sha1>",
+       "git cat-file [--batch|--batch-check] < <list_of_sha1s>",
+       NULL
+};
 
 int cmd_cat_file(int argc, const char **argv, const char *prefix)
 {
-       int i, opt = 0, batch_check = 0;
+       int opt = 0, batch = 0;
        const char *exp_type = NULL, *obj_name = NULL;
 
-       git_config(git_default_config);
-
-       for (i = 1; i < argc; ++i) {
-               const char *arg = argv[i];
-
-               if (!strcmp(arg, "--batch-check")) {
-                       if (opt) {
-                               error("git-cat-file: Can't use --batch-check with -%c", opt);
-                               usage(cat_file_usage);
-                       } else if (exp_type) {
-                               error("git-cat-file: Can't use --batch-check when a type (\"%s\") is specified", exp_type);
-                               usage(cat_file_usage);
-                       } else if (obj_name) {
-                               error("git-cat-file: Can't use --batch-check when an object (\"%s\") is specified", obj_name);
-                               usage(cat_file_usage);
-                       }
-
-                       batch_check = 1;
-                       continue;
-               }
-
-               if (!strcmp(arg, "-t") || !strcmp(arg, "-s") || !strcmp(arg, "-e") || !strcmp(arg, "-p")) {
-                       if (batch_check) {
-                               error("git-cat-file: Can't use %s with --batch-check", arg);
-                               usage(cat_file_usage);
-                       }
-
-                       exp_type = arg;
-                       opt = exp_type[1];
-                       continue;
-               }
-
-               if (arg[0] == '-')
-                       usage(cat_file_usage);
-
-               if (!exp_type) {
-                       if (batch_check) {
-                               error("git-cat-file: Can't specify a type (\"%s\") with --batch-check", arg);
-                               usage(cat_file_usage);
-                       }
-
-                       exp_type = arg;
-                       continue;
-               }
-
-               if (obj_name)
-                       usage(cat_file_usage);
-
-               // We should have hit one of the earlier if (batch_check) cases before
-               // getting here.
-               assert(!batch_check);
-
-               obj_name = arg;
-               break;
+       const struct option options[] = {
+               OPT_GROUP("<type> can be one of: blob, tree, commit, tag"),
+               OPT_SET_INT('t', NULL, &opt, "show object type", 't'),
+               OPT_SET_INT('s', NULL, &opt, "show object size", 's'),
+               OPT_SET_INT('e', NULL, &opt,
+                           "exit with zero when there's no error", 'e'),
+               OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
+               OPT_SET_INT(0, "batch", &batch,
+                           "show info and content of objects feeded on stdin", BATCH),
+               OPT_SET_INT(0, "batch-check", &batch,
+                           "show info about objects feeded on stdin",
+                           BATCH_CHECK),
+               OPT_END()
+       };
+
+       git_config(git_default_config, NULL);
+
+       if (argc != 3 && argc != 2)
+               usage_with_options(cat_file_usage, options);
+
+       argc = parse_options(argc, argv, options, cat_file_usage, 0);
+
+       if (opt) {
+               if (argc == 1)
+                       obj_name = argv[0];
+               else
+                       usage_with_options(cat_file_usage, options);
+       }
+       if (!opt && !batch) {
+               if (argc == 2) {
+                       exp_type = argv[0];
+                       obj_name = argv[1];
+               } else
+                       usage_with_options(cat_file_usage, options);
+       }
+       if (batch && (opt || argc)) {
+               usage_with_options(cat_file_usage, options);
        }
 
-       if (batch_check)
-               return batch_objects();
-
-       if (!exp_type || !obj_name)
-               usage(cat_file_usage);
+       if (batch)
+               return batch_objects(batch);
 
        return cat_one_file(opt, exp_type, obj_name);
 }