sha1_to_hex: properly terminate the SHA1

[git.git] / cat-file.c

diff --git a/cat-file.c b/cat-file.c
index 0076fc5..96d66b4 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,28 +11,52 @@ int main(int argc, char **argv)
        char type[20];
        void *buf;
        unsigned long size;
+       int opt;
 
+       setup_git_directory();
        if (argc != 3 || get_sha1(argv[2], sha1))
-               usage("git-cat-file [-t | tagname] <sha1>");
+               usage("git-cat-file [-t|-s|-e|<type>] <sha1>");
 
-       if (!strcmp("-t", argv[1])) {
-               if (!sha1_object_info(sha1, type, &size)) {
+       opt = 0;
+       if ( argv[1][0] == '-' ) {
+               opt = argv[1][1];
+               if ( !opt || argv[1][2] )
+                       opt = -1; /* Not a single character option */
+       }
+
+       buf = NULL;
+       switch (opt) {
+       case 't':
+               if (!sha1_object_info(sha1, type, NULL)) {
                        printf("%s\n", type);
                        return 0;
                }
-               buf = NULL;
-       } else {
+               break;
+
+       case 's':
+               if (!sha1_object_info(sha1, type, &size)) {
+                       printf("%lu\n", size);
+                       return 0;
+               }
+               break;
+
+       case 'e':
+               return !has_sha1_file(sha1);
+
+       case 0:
                buf = read_object_with_reference(sha1, argv[1], &size, NULL);
+               break;
+
+       default:
+               die("git-cat-file: unknown option: %s\n", argv[1]);
        }
 
        if (!buf)
                die("git-cat-file %s: bad file", argv[2]);
 
        while (size > 0) {
-               long ret = write(1, buf, size);
+               long ret = xwrite(1, buf, size);
                if (ret < 0) {
-                       if (errno == EAGAIN)
-                               continue;
                        /* Ignore epipe */
                        if (errno == EPIPE)
                                break;