[PATCH] Consolidate the error handling

[git.git] / cat-file.c

diff --git a/cat-file.c b/cat-file.c
index d8f0121..3c47d79 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,18 +11,35 @@ 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 [-t | tagname] <sha1>");
        buf = read_sha1_file(sha1, type, &size);
        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("cat-file %s: bad file", argv[2]);
+       if (!strcmp("-t", argv[1])) {
+               buf = type;
+               size = strlen(type);
+               type[size] = '\n';
+               size++;
+       } else if (strcmp(type, argv[1])) {
+               die("cat-file %s: bad tag", 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("cat-file: %s", strerror(errno));
+               } else if (!ret) {
+                       die("cat-file: disk full?");
+               }
+               size -= ret;
+               buf += ret;
+       }
+       return 0;
 }