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>");
- buf = read_sha1_file(sha1, type, &size);
+ setup_git_directory();
+ if (argc != 3 || get_sha1(argv[2], sha1))
+ usage("git-cat-file [-t | -s | <type>] <sha1>");
+
+ if (!strcmp("-t", argv[1]) || !strcmp("-s", argv[1])) {
+ if (!sha1_object_info(sha1, type,
+ argv[1][1] == 's' ? &size : NULL)) {
+ switch (argv[1][1]) {
+ case 't':
+ printf("%s\n", type);
+ break;
+ case 's':
+ printf("%lu\n", size);
+ break;
+ }
+ return 0;
+ }
+ buf = NULL;
+ } else {
+ buf = read_object_with_reference(sha1, argv[1], &size, NULL);
+ }
+
if (!buf)
- 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);
+ die("git-cat-file %s: bad file", argv[2]);
+
+ while (size > 0) {
+ long ret = write(1, buf, size);
+ if (ret < 0) {
+ if (errno == EAGAIN)
+ continue;
+ /* Ignore epipe */
+ if (errno == EPIPE)
+ break;
+ die("git-cat-file: %s", strerror(errno));
+ } else if (!ret) {
+ die("git-cat-file: disk full?");
+ }
+ size -= ret;
+ buf += ret;
+ }
+ return 0;
}