diff --git a/unpack-objects.c b/unpack-objects.c
index 8490895cf02df538327fa79bc0b2ffff2f06bd84..815a1b382b1f92686efd00bee5794a8480d7f7b7 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
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;
{
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));
int i;
unsigned char sha1[20];
+ setup_git_directory();
+
+ quiet = !isatty(2);
+
for (i = 1 ; i < argc; i++) {
const char *arg = argv[i];
/* 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;
}