diff --git a/unpack-objects.c b/unpack-objects.c
index 355889f65bef73e512cf4c053493ae25c6a77b96..4b5b5cb3e22454fe487002f698272a19a1d8861d 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
#include <sys/time.h>
static int dry_run, quiet;
-static const char unpack_usage[] = "git-unpack-objects < pack-file";
+static const char unpack_usage[] = "git-unpack-objects [-n] [-q] < pack-file";
/* We always read in 4kB chunks. */
static unsigned char buffer[4096];
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;
stream.next_in = fill(1);
stream.avail_in = len;
}
+ inflateEnd(&stream);
return buf;
}
unsigned long base_size;
char type[20];
unsigned char base_sha1[20];
+ int result;
memcpy(base_sha1, fill(20), 20);
use(20);
base = read_sha1_file(base_sha1, type, &base_size);
if (!base)
die("failed to read delta-pack base object %s", sha1_to_hex(base_sha1));
- return resolve_delta(type, base, base_size, delta_data, delta_size);
+ result = resolve_delta(type, base, base_size, delta_data, delta_size);
+ free(base);
+ return result;
}
static void unpack_one(unsigned nr, unsigned total)
static unsigned long last_sec;
static unsigned last_percent;
struct timeval now;
- unsigned percentage = ((1+nr) * 100) / total;
+ unsigned percentage = (nr * 100) / total;
gettimeofday(&now, NULL);
if (percentage != last_percent || now.tv_sec != last_sec) {
use(sizeof(struct pack_header));
for (i = 0; i < nr_objects; i++)
- unpack_one(i, nr_objects);
+ unpack_one(i+1, nr_objects);
if (delta_list)
die("unresolved deltas left after unpacking");
}
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;
}