X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cat-file.c;h=d775a1545beb84caf05cae8980fb2d839240fdea;hb=4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff;hp=d8f0121e499252a0b4ef9ef722a02d35cc029ae0;hpb=8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68;p=git.git

diff --git a/cat-file.c b/cat-file.c
index d8f0121e..d775a154 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,18 +11,46 @@ 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>");
-	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;
 }