Make "cat-file" output the file contents to stdout.

New syntax: "cat-file -t <sha1>" shows the tag, while "cat-file <tag> <sha1>"
outputs the file contents after checking that the supplied tag matches.

diff --git a/cache.h b/cache.h
index 98a32a9ad39883c6d05a000a68511d4b1ee2b3c7..b1313c503c7b3eca327133d683d4a4cc36159131 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -7,6 +7,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <errno.h>
 #include <sys/mman.h>
 

diff --git a/cat-file.c b/cat-file.c
index d8f0121e499252a0b4ef9ef722a02d35cc029ae0..3071672c6ce2ffb7c1c7d43c1a728f8e020e296b 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,18 +11,42 @@ int main(int argc, char **argv)
        char type[20];
        void *buf;
        unsigned long size;
-       char template[] = "temp_git_file_XXXXXX";
        int fd;
 
-       if (argc != 2 || get_sha1_hex(argv[1], sha1))
-               usage("cat-file: cat-file <sha1>");
+       if (argc != 3 || get_sha1_hex(argv[2], sha1))
+               usage("cat-file: cat-file [-t | tagname] <sha1>");
        buf = read_sha1_file(sha1, type, &size);
-       if (!buf)
+       if (!buf) {
+               fprintf(stderr, "cat-file %s: bad file\n", argv[2]);
                exit(1);
-       fd = mkstemp(template);
-       if (fd < 0)
-               usage("unable to create tempfile");
-       if (write(fd, buf, size) != size)
-               strcpy(type, "bad");
-       printf("%s: %s\n", template, type);
+       }
+       if (!strcmp("-t", argv[1])) {
+               buf = type;
+               size = strlen(type);
+               type[size] = '\n';
+               size++;
+       } else if (strcmp(type, argv[1])) {
+               fprintf(stderr, "cat-file %s: bad tag\n", argv[2]);
+               exit(1);        /* bad tag */
+       }
+
+       while (size > 0) {
+               long ret = write(1, buf, size);
+               if (ret < 0) {
+                       if (errno == EAGAIN)
+                               continue;
+                       /* Ignore epipe */
+                       if (errno == EPIPE)
+                               break;
+                       fprintf(stderr, "cat-file: %s\n", strerror(errno));
+                       exit(1);
+               }
+               if (!ret) {
+                       fprintf(stderr, "cat-file: disk full?");
+                       exit(1);
+               }
+               size -= ret;
+               buf += ret;
+       }
+       return 0;
 }