X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cat-file.c;h=96d66b43043ee1e2381bfb80bb2bc1c7063ecc38;hb=5b5d4d9e1b31997b3179e6a253d47b7eea03d0fa;hp=3829fb6097ad9840cca7654f0b8a718100d590ac;hpb=19b2860cba5742ab31fd682b80fefefac19be141;p=git.git

diff --git a/cat-file.c b/cat-file.c
index 3829fb60..96d66b43 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,38 +11,58 @@ int main(int argc, char **argv)
 	char type[20];
 	void *buf;
 	unsigned long size;
+	int opt;
 
-	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) {
-		fprintf(stderr, "cat-file %s: bad file\n", argv[2]);
-		exit(1);
+	setup_git_directory();
+	if (argc != 3 || get_sha1(argv[2], sha1))
+		usage("git-cat-file [-t|-s|-e|<type>] <sha1>");
+
+	opt = 0;
+	if ( argv[1][0] == '-' ) {
+		opt = argv[1][1];
+		if ( !opt || argv[1][2] )
+			opt = -1; /* Not a single character option */
 	}
-	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 */
+
+	buf = NULL;
+	switch (opt) {
+	case 't':
+		if (!sha1_object_info(sha1, type, NULL)) {
+			printf("%s\n", type);
+			return 0;
+		}
+		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;
-			fprintf(stderr, "cat-file: %s\n", strerror(errno));
-			exit(1);
-		}
-		if (!ret) {
-			fprintf(stderr, "cat-file: disk full?");
-			exit(1);
+			die("git-cat-file: %s", strerror(errno));
+		} else if (!ret) {
+			die("git-cat-file: disk full?");
 		}
 		size -= ret;
 		buf += ret;