contrib/git-svn: accept configuration via repo-config

[git.git] / unpack-objects.c

diff --git a/unpack-objects.c b/unpack-objects.c
index cfd61ae..815a1b3 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -31,12 +31,10 @@ static void * fill(int min)
                offset = 0;
        }
        do {
-               int ret = read(0, buffer + len, sizeof(buffer) - len);
+               int ret = xread(0, buffer + len, sizeof(buffer) - len);
                if (ret <= 0) {
                        if (!ret)
                                die("early EOF");
-                       if (errno == EAGAIN || errno == EINTR)
-                               continue;
                        die("read error on input: %s", strerror(errno));
                }
                len += ret;
@@ -248,13 +246,12 @@ static void unpack_all(void)
 {
        int i;
        struct pack_header *hdr = fill(sizeof(struct pack_header));
-       unsigned version = ntohl(hdr->hdr_version);
        unsigned nr_objects = ntohl(hdr->hdr_entries);
 
        if (ntohl(hdr->hdr_signature) != PACK_SIGNATURE)
                die("bad pack file");
-       if (version != PACK_VERSION)
-               die("unable to handle pack file version %d", version);
+       if (!pack_version_ok(hdr->hdr_version))
+               die("unknown pack file version %d", ntohl(hdr->hdr_version));
        fprintf(stderr, "Unpacking %d objects\n", nr_objects);
 
        use(sizeof(struct pack_header));
@@ -271,6 +268,8 @@ int main(int argc, char **argv)
 
        setup_git_directory();
 
+       quiet = !isatty(2);
+
        for (i = 1 ; i < argc; i++) {
                const char *arg = argv[i];
 
@@ -299,14 +298,9 @@ int main(int argc, char **argv)
 
        /* Write the last part of the buffer to stdout */
        while (len) {
-               int ret = write(1, buffer + offset, len);
-               if (!ret)
+               int ret = xwrite(1, buffer + offset, len);
+               if (ret <= 0)
                        break;
-               if (ret < 0) {
-                       if (errno == EAGAIN || errno == EINTR)
-                               continue;
-                       break;
-               }
                len -= ret;
                offset += ret;
        }