2006-08-03 15:24:37 +00:00
|
|
|
#include "builtin.h"
|
2005-06-25 22:27:14 +00:00
|
|
|
#include "cache.h"
|
2005-06-25 22:59:31 +00:00
|
|
|
#include "object.h"
|
2005-06-26 11:29:18 +00:00
|
|
|
#include "delta.h"
|
2005-06-28 21:21:02 +00:00
|
|
|
#include "pack.h"
|
2006-04-02 12:44:09 +00:00
|
|
|
#include "blob.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "tree.h"
|
2008-02-25 21:46:11 +00:00
|
|
|
#include "tree-walk.h"
|
2007-04-18 18:27:45 +00:00
|
|
|
#include "progress.h"
|
2008-02-25 21:46:10 +00:00
|
|
|
#include "decorate.h"
|
2008-02-25 21:46:11 +00:00
|
|
|
#include "fsck.h"
|
2005-06-25 22:27:14 +00:00
|
|
|
|
2008-02-25 21:46:11 +00:00
|
|
|
static int dry_run, quiet, recover, has_errors, strict;
|
2008-09-13 17:18:36 +00:00
|
|
|
static const char unpack_usage[] = "git unpack-objects [-n] [-q] [-r] [--strict] < pack-file";
|
2005-06-25 22:27:14 +00:00
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
/* We always read in 4kB chunks. */
|
|
|
|
static unsigned char buffer[4096];
|
2007-04-09 05:06:30 +00:00
|
|
|
static unsigned int offset, len;
|
|
|
|
static off_t consumed_bytes;
|
2008-10-01 18:05:20 +00:00
|
|
|
static git_SHA_CTX ctx;
|
2005-06-25 22:27:14 +00:00
|
|
|
|
2008-03-05 07:46:51 +00:00
|
|
|
/*
|
|
|
|
* When running under --strict mode, objects whose reachability are
|
|
|
|
* suspect are kept in core without getting written in the object
|
|
|
|
* store.
|
|
|
|
*/
|
2008-02-25 21:46:10 +00:00
|
|
|
struct obj_buffer {
|
|
|
|
char *buffer;
|
|
|
|
unsigned long size;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct decoration obj_decorate;
|
|
|
|
|
|
|
|
static struct obj_buffer *lookup_object_buffer(struct object *base)
|
|
|
|
{
|
|
|
|
return lookup_decoration(&obj_decorate, base);
|
|
|
|
}
|
|
|
|
|
2008-02-25 21:46:11 +00:00
|
|
|
static void add_object_buffer(struct object *object, char *buffer, unsigned long size)
|
|
|
|
{
|
|
|
|
struct obj_buffer *obj;
|
|
|
|
obj = xcalloc(1, sizeof(struct obj_buffer));
|
|
|
|
obj->buffer = buffer;
|
|
|
|
obj->size = size;
|
|
|
|
if (add_decoration(&obj_decorate, object, obj))
|
|
|
|
die("object %s tried to add buffer twice!", sha1_to_hex(object->sha1));
|
|
|
|
}
|
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
/*
|
|
|
|
* Make sure at least "min" bytes are available in the buffer, and
|
|
|
|
* return the pointer to the buffer.
|
|
|
|
*/
|
2006-10-31 01:44:27 +00:00
|
|
|
static void *fill(int min)
|
2005-06-29 03:34:23 +00:00
|
|
|
{
|
|
|
|
if (min <= len)
|
|
|
|
return buffer + offset;
|
|
|
|
if (min > sizeof(buffer))
|
|
|
|
die("cannot fill %d bytes", min);
|
|
|
|
if (offset) {
|
2008-10-01 18:05:20 +00:00
|
|
|
git_SHA1_Update(&ctx, buffer, offset);
|
2006-10-31 01:44:27 +00:00
|
|
|
memmove(buffer, buffer + offset, len);
|
2005-06-29 03:34:23 +00:00
|
|
|
offset = 0;
|
|
|
|
}
|
|
|
|
do {
|
2007-05-15 12:49:22 +00:00
|
|
|
ssize_t ret = xread(0, buffer + len, sizeof(buffer) - len);
|
2005-06-29 03:34:23 +00:00
|
|
|
if (ret <= 0) {
|
|
|
|
if (!ret)
|
|
|
|
die("early EOF");
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("read error on input");
|
2005-06-29 03:34:23 +00:00
|
|
|
}
|
|
|
|
len += ret;
|
|
|
|
} while (len < min);
|
|
|
|
return buffer;
|
|
|
|
}
|
2005-06-25 22:59:31 +00:00
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
static void use(int bytes)
|
|
|
|
{
|
|
|
|
if (bytes > len)
|
|
|
|
die("used more bytes than were available");
|
|
|
|
len -= bytes;
|
|
|
|
offset += bytes;
|
2007-04-09 05:06:30 +00:00
|
|
|
|
|
|
|
/* make sure off_t is sufficiently large not to wrap */
|
|
|
|
if (consumed_bytes > consumed_bytes + bytes)
|
|
|
|
die("pack too large for current definition of off_t");
|
2006-09-21 04:07:39 +00:00
|
|
|
consumed_bytes += bytes;
|
2005-06-29 03:34:23 +00:00
|
|
|
}
|
2005-06-25 22:27:14 +00:00
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
static void *get_data(unsigned long size)
|
2005-06-25 22:27:14 +00:00
|
|
|
{
|
2005-06-29 03:34:23 +00:00
|
|
|
z_stream stream;
|
|
|
|
void *buf = xmalloc(size);
|
|
|
|
|
|
|
|
memset(&stream, 0, sizeof(stream));
|
|
|
|
|
|
|
|
stream.next_out = buf;
|
|
|
|
stream.avail_out = size;
|
|
|
|
stream.next_in = fill(1);
|
|
|
|
stream.avail_in = len;
|
2009-01-08 03:54:47 +00:00
|
|
|
git_inflate_init(&stream);
|
2005-06-29 03:34:23 +00:00
|
|
|
|
|
|
|
for (;;) {
|
2009-01-08 03:54:47 +00:00
|
|
|
int ret = git_inflate(&stream, 0);
|
2005-06-29 03:34:23 +00:00
|
|
|
use(len - stream.avail_in);
|
|
|
|
if (stream.total_out == size && ret == Z_STREAM_END)
|
|
|
|
break;
|
2006-09-04 05:55:54 +00:00
|
|
|
if (ret != Z_OK) {
|
|
|
|
error("inflate returned %d\n", ret);
|
|
|
|
free(buf);
|
|
|
|
buf = NULL;
|
2006-09-13 19:59:20 +00:00
|
|
|
if (!recover)
|
2006-09-04 05:55:54 +00:00
|
|
|
exit(1);
|
|
|
|
has_errors = 1;
|
|
|
|
break;
|
|
|
|
}
|
2005-06-29 03:34:23 +00:00
|
|
|
stream.next_in = fill(1);
|
|
|
|
stream.avail_in = len;
|
|
|
|
}
|
2009-01-08 03:54:47 +00:00
|
|
|
git_inflate_end(&stream);
|
2005-06-29 03:34:23 +00:00
|
|
|
return buf;
|
2005-06-25 22:27:14 +00:00
|
|
|
}
|
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
struct delta_info {
|
|
|
|
unsigned char base_sha1[20];
|
2007-04-09 05:06:30 +00:00
|
|
|
unsigned nr;
|
|
|
|
off_t base_offset;
|
2005-06-29 03:34:23 +00:00
|
|
|
unsigned long size;
|
|
|
|
void *delta;
|
|
|
|
struct delta_info *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct delta_info *delta_list;
|
|
|
|
|
2006-09-21 04:07:39 +00:00
|
|
|
static void add_delta_to_list(unsigned nr, unsigned const char *base_sha1,
|
2007-04-09 05:06:30 +00:00
|
|
|
off_t base_offset,
|
2006-09-21 04:07:39 +00:00
|
|
|
void *delta, unsigned long size)
|
2005-06-25 22:27:14 +00:00
|
|
|
{
|
2005-06-29 03:34:23 +00:00
|
|
|
struct delta_info *info = xmalloc(sizeof(*info));
|
2005-06-25 22:27:14 +00:00
|
|
|
|
2006-08-23 06:49:00 +00:00
|
|
|
hashcpy(info->base_sha1, base_sha1);
|
2006-09-21 04:07:39 +00:00
|
|
|
info->base_offset = base_offset;
|
2005-06-29 03:34:23 +00:00
|
|
|
info->size = size;
|
|
|
|
info->delta = delta;
|
2006-09-21 04:07:39 +00:00
|
|
|
info->nr = nr;
|
2005-06-29 03:34:23 +00:00
|
|
|
info->next = delta_list;
|
|
|
|
delta_list = info;
|
2005-06-25 22:27:14 +00:00
|
|
|
}
|
|
|
|
|
2006-09-21 04:07:39 +00:00
|
|
|
struct obj_info {
|
2007-04-09 05:06:30 +00:00
|
|
|
off_t offset;
|
2006-09-21 04:07:39 +00:00
|
|
|
unsigned char sha1[20];
|
2008-02-25 21:46:11 +00:00
|
|
|
struct object *obj;
|
2006-09-21 04:07:39 +00:00
|
|
|
};
|
|
|
|
|
2008-02-25 21:46:11 +00:00
|
|
|
#define FLAG_OPEN (1u<<20)
|
|
|
|
#define FLAG_WRITTEN (1u<<21)
|
|
|
|
|
2006-09-21 04:07:39 +00:00
|
|
|
static struct obj_info *obj_list;
|
2009-06-18 17:28:43 +00:00
|
|
|
static unsigned nr_objects;
|
2008-02-25 21:46:11 +00:00
|
|
|
|
2008-03-05 07:46:51 +00:00
|
|
|
/*
|
|
|
|
* Called only from check_object() after it verified this object
|
|
|
|
* is Ok.
|
|
|
|
*/
|
2008-02-25 21:46:11 +00:00
|
|
|
static void write_cached_object(struct object *obj)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct obj_buffer *obj_buf = lookup_object_buffer(obj);
|
|
|
|
if (write_sha1_file(obj_buf->buffer, obj_buf->size, typename(obj->type), sha1) < 0)
|
|
|
|
die("failed to write object %s", sha1_to_hex(obj->sha1));
|
|
|
|
obj->flags |= FLAG_WRITTEN;
|
|
|
|
}
|
|
|
|
|
2008-03-05 07:46:51 +00:00
|
|
|
/*
|
|
|
|
* At the very end of the processing, write_rest() scans the objects
|
|
|
|
* that have reachability requirements and calls this function.
|
|
|
|
* Verify its reachability and validity recursively and write it out.
|
|
|
|
*/
|
2008-02-25 21:46:11 +00:00
|
|
|
static int check_object(struct object *obj, int type, void *data)
|
|
|
|
{
|
|
|
|
if (!obj)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (obj->flags & FLAG_WRITTEN)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (type != OBJ_ANY && obj->type != type)
|
|
|
|
die("object type mismatch");
|
|
|
|
|
|
|
|
if (!(obj->flags & FLAG_OPEN)) {
|
|
|
|
unsigned long size;
|
|
|
|
int type = sha1_object_info(obj->sha1, &size);
|
|
|
|
if (type != obj->type || type <= 0)
|
|
|
|
die("object of unexpected type");
|
|
|
|
obj->flags |= FLAG_WRITTEN;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fsck_object(obj, 1, fsck_error_function))
|
|
|
|
die("Error in object");
|
2009-06-18 17:28:43 +00:00
|
|
|
if (!fsck_walk(obj, check_object, NULL))
|
2008-02-25 21:46:11 +00:00
|
|
|
die("Error on reachable objects of %s", sha1_to_hex(obj->sha1));
|
|
|
|
write_cached_object(obj);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_rest(void)
|
|
|
|
{
|
|
|
|
unsigned i;
|
|
|
|
for (i = 0; i < nr_objects; i++)
|
2009-06-18 17:28:43 +00:00
|
|
|
check_object(obj_list[i].obj, OBJ_ANY, NULL);
|
2008-02-25 21:46:11 +00:00
|
|
|
}
|
2005-06-29 03:34:23 +00:00
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
static void added_object(unsigned nr, enum object_type type,
|
|
|
|
void *data, unsigned long size);
|
2006-09-21 04:07:39 +00:00
|
|
|
|
2008-03-05 07:46:51 +00:00
|
|
|
/*
|
|
|
|
* Write out nr-th object from the list, now we know the contents
|
|
|
|
* of it. Under --strict, this buffers structured objects in-core,
|
|
|
|
* to be checked at the end.
|
|
|
|
*/
|
2007-02-26 19:55:59 +00:00
|
|
|
static void write_object(unsigned nr, enum object_type type,
|
|
|
|
void *buf, unsigned long size)
|
2005-06-29 16:38:02 +00:00
|
|
|
{
|
2008-02-25 21:46:11 +00:00
|
|
|
if (!strict) {
|
|
|
|
if (write_sha1_file(buf, size, typename(type), obj_list[nr].sha1) < 0)
|
|
|
|
die("failed to write object");
|
2008-03-05 07:46:51 +00:00
|
|
|
added_object(nr, type, buf, size);
|
2008-02-25 21:46:11 +00:00
|
|
|
free(buf);
|
2008-03-05 07:46:51 +00:00
|
|
|
obj_list[nr].obj = NULL;
|
2008-02-25 21:46:11 +00:00
|
|
|
} else if (type == OBJ_BLOB) {
|
|
|
|
struct blob *blob;
|
|
|
|
if (write_sha1_file(buf, size, typename(type), obj_list[nr].sha1) < 0)
|
|
|
|
die("failed to write object");
|
2008-03-05 07:46:51 +00:00
|
|
|
added_object(nr, type, buf, size);
|
2008-02-25 21:46:11 +00:00
|
|
|
free(buf);
|
|
|
|
|
|
|
|
blob = lookup_blob(obj_list[nr].sha1);
|
|
|
|
if (blob)
|
|
|
|
blob->object.flags |= FLAG_WRITTEN;
|
|
|
|
else
|
|
|
|
die("invalid blob object");
|
2008-03-05 07:46:51 +00:00
|
|
|
obj_list[nr].obj = NULL;
|
2008-02-25 21:46:11 +00:00
|
|
|
} else {
|
|
|
|
struct object *obj;
|
|
|
|
int eaten;
|
|
|
|
hash_sha1_file(buf, size, typename(type), obj_list[nr].sha1);
|
2008-03-05 07:46:51 +00:00
|
|
|
added_object(nr, type, buf, size);
|
2008-02-25 21:46:11 +00:00
|
|
|
obj = parse_object_buffer(obj_list[nr].sha1, type, size, buf, &eaten);
|
|
|
|
if (!obj)
|
|
|
|
die("invalid %s", typename(type));
|
|
|
|
add_object_buffer(obj, buf, size);
|
|
|
|
obj->flags |= FLAG_OPEN;
|
|
|
|
obj_list[nr].obj = obj;
|
|
|
|
}
|
2005-06-29 16:38:02 +00:00
|
|
|
}
|
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
static void resolve_delta(unsigned nr, enum object_type type,
|
2006-09-04 05:55:54 +00:00
|
|
|
void *base, unsigned long base_size,
|
|
|
|
void *delta, unsigned long delta_size)
|
2005-06-25 22:27:14 +00:00
|
|
|
{
|
2005-06-29 03:34:23 +00:00
|
|
|
void *result;
|
|
|
|
unsigned long result_size;
|
2005-06-25 22:27:14 +00:00
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
result = patch_delta(base, base_size,
|
|
|
|
delta, delta_size,
|
|
|
|
&result_size);
|
|
|
|
if (!result)
|
|
|
|
die("failed to apply delta");
|
|
|
|
free(delta);
|
2007-02-26 19:55:59 +00:00
|
|
|
write_object(nr, type, result, result_size);
|
2005-06-25 22:27:14 +00:00
|
|
|
}
|
|
|
|
|
2008-03-05 07:46:51 +00:00
|
|
|
/*
|
|
|
|
* We now know the contents of an object (which is nr-th in the pack);
|
|
|
|
* resolve all the deltified objects that are based on it.
|
|
|
|
*/
|
2007-02-26 19:55:59 +00:00
|
|
|
static void added_object(unsigned nr, enum object_type type,
|
|
|
|
void *data, unsigned long size)
|
2005-06-25 22:59:31 +00:00
|
|
|
{
|
2005-06-29 03:34:23 +00:00
|
|
|
struct delta_info **p = &delta_list;
|
|
|
|
struct delta_info *info;
|
|
|
|
|
|
|
|
while ((info = *p) != NULL) {
|
2006-09-21 04:07:39 +00:00
|
|
|
if (!hashcmp(info->base_sha1, obj_list[nr].sha1) ||
|
|
|
|
info->base_offset == obj_list[nr].offset) {
|
2005-06-29 03:34:23 +00:00
|
|
|
*p = info->next;
|
|
|
|
p = &delta_list;
|
2006-09-21 04:07:39 +00:00
|
|
|
resolve_delta(info->nr, type, data, size,
|
|
|
|
info->delta, info->size);
|
2005-06-29 03:34:23 +00:00
|
|
|
free(info);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
p = &info->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
static void unpack_non_delta_entry(enum object_type type, unsigned long size,
|
2006-09-21 04:07:39 +00:00
|
|
|
unsigned nr)
|
2005-06-29 03:34:23 +00:00
|
|
|
{
|
|
|
|
void *buf = get_data(size);
|
2005-06-26 11:29:18 +00:00
|
|
|
|
2006-09-04 05:55:54 +00:00
|
|
|
if (!dry_run && buf)
|
2007-02-26 19:55:59 +00:00
|
|
|
write_object(nr, type, buf, size);
|
2008-02-25 21:46:11 +00:00
|
|
|
else
|
|
|
|
free(buf);
|
2005-06-26 11:29:18 +00:00
|
|
|
}
|
|
|
|
|
2008-03-05 07:46:51 +00:00
|
|
|
static int resolve_against_held(unsigned nr, const unsigned char *base,
|
|
|
|
void *delta_data, unsigned long delta_size)
|
|
|
|
{
|
|
|
|
struct object *obj;
|
|
|
|
struct obj_buffer *obj_buffer;
|
|
|
|
obj = lookup_object(base);
|
|
|
|
if (!obj)
|
|
|
|
return 0;
|
|
|
|
obj_buffer = lookup_object_buffer(obj);
|
|
|
|
if (!obj_buffer)
|
|
|
|
return 0;
|
|
|
|
resolve_delta(nr, obj->type, obj_buffer->buffer,
|
|
|
|
obj_buffer->size, delta_data, delta_size);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
|
2006-09-21 04:07:39 +00:00
|
|
|
unsigned nr)
|
2005-06-26 11:29:18 +00:00
|
|
|
{
|
2005-06-29 03:34:23 +00:00
|
|
|
void *delta_data, *base;
|
|
|
|
unsigned long base_size;
|
|
|
|
unsigned char base_sha1[20];
|
2005-06-26 11:29:18 +00:00
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
if (type == OBJ_REF_DELTA) {
|
2006-09-21 04:07:39 +00:00
|
|
|
hashcpy(base_sha1, fill(20));
|
|
|
|
use(20);
|
|
|
|
delta_data = get_data(delta_size);
|
|
|
|
if (dry_run || !delta_data) {
|
|
|
|
free(delta_data);
|
|
|
|
return;
|
|
|
|
}
|
2008-03-05 07:46:51 +00:00
|
|
|
if (has_sha1_file(base_sha1))
|
|
|
|
; /* Ok we have this one */
|
|
|
|
else if (resolve_against_held(nr, base_sha1,
|
|
|
|
delta_data, delta_size))
|
|
|
|
return; /* we are done */
|
|
|
|
else {
|
|
|
|
/* cannot resolve yet --- queue it */
|
2006-09-21 04:07:39 +00:00
|
|
|
hashcpy(obj_list[nr].sha1, null_sha1);
|
|
|
|
add_delta_to_list(nr, base_sha1, 0, delta_data, delta_size);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
unsigned base_found = 0;
|
|
|
|
unsigned char *pack, c;
|
2007-04-09 05:06:30 +00:00
|
|
|
off_t base_offset;
|
2006-09-21 04:07:39 +00:00
|
|
|
unsigned lo, mid, hi;
|
2005-06-26 15:40:08 +00:00
|
|
|
|
2006-09-21 04:07:39 +00:00
|
|
|
pack = fill(1);
|
|
|
|
c = *pack;
|
|
|
|
use(1);
|
|
|
|
base_offset = c & 127;
|
|
|
|
while (c & 128) {
|
|
|
|
base_offset += 1;
|
2007-04-09 05:06:29 +00:00
|
|
|
if (!base_offset || MSB(base_offset, 7))
|
2006-09-21 04:07:39 +00:00
|
|
|
die("offset value overflow for delta base object");
|
|
|
|
pack = fill(1);
|
|
|
|
c = *pack;
|
|
|
|
use(1);
|
|
|
|
base_offset = (base_offset << 7) + (c & 127);
|
|
|
|
}
|
|
|
|
base_offset = obj_list[nr].offset - base_offset;
|
2008-10-29 23:02:45 +00:00
|
|
|
if (base_offset <= 0 || base_offset >= obj_list[nr].offset)
|
|
|
|
die("offset value out of bound for delta base object");
|
2005-06-26 11:29:18 +00:00
|
|
|
|
2006-09-21 04:07:39 +00:00
|
|
|
delta_data = get_data(delta_size);
|
|
|
|
if (dry_run || !delta_data) {
|
|
|
|
free(delta_data);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
lo = 0;
|
|
|
|
hi = nr;
|
|
|
|
while (lo < hi) {
|
|
|
|
mid = (lo + hi)/2;
|
|
|
|
if (base_offset < obj_list[mid].offset) {
|
|
|
|
hi = mid;
|
|
|
|
} else if (base_offset > obj_list[mid].offset) {
|
|
|
|
lo = mid + 1;
|
|
|
|
} else {
|
|
|
|
hashcpy(base_sha1, obj_list[mid].sha1);
|
|
|
|
base_found = !is_null_sha1(base_sha1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!base_found) {
|
2008-03-05 07:46:51 +00:00
|
|
|
/*
|
|
|
|
* The delta base object is itself a delta that
|
|
|
|
* has not been resolved yet.
|
|
|
|
*/
|
2006-09-21 04:07:39 +00:00
|
|
|
hashcpy(obj_list[nr].sha1, null_sha1);
|
|
|
|
add_delta_to_list(nr, null_sha1, base_offset, delta_data, delta_size);
|
|
|
|
return;
|
2008-02-25 21:46:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-03-05 07:46:51 +00:00
|
|
|
if (resolve_against_held(nr, base_sha1, delta_data, delta_size))
|
|
|
|
return;
|
2006-09-21 04:07:39 +00:00
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
base = read_sha1_file(base_sha1, &type, &base_size);
|
2006-09-04 05:55:54 +00:00
|
|
|
if (!base) {
|
|
|
|
error("failed to read delta-pack base object %s",
|
|
|
|
sha1_to_hex(base_sha1));
|
2006-09-13 19:59:20 +00:00
|
|
|
if (!recover)
|
2006-09-04 05:55:54 +00:00
|
|
|
exit(1);
|
|
|
|
has_errors = 1;
|
|
|
|
return;
|
|
|
|
}
|
2006-09-21 04:07:39 +00:00
|
|
|
resolve_delta(nr, type, base, base_size, delta_data, delta_size);
|
2005-08-03 12:11:00 +00:00
|
|
|
free(base);
|
2005-06-26 11:29:18 +00:00
|
|
|
}
|
|
|
|
|
2007-04-18 18:27:45 +00:00
|
|
|
static void unpack_one(unsigned nr)
|
2005-06-26 11:29:18 +00:00
|
|
|
{
|
2005-06-29 05:15:57 +00:00
|
|
|
unsigned shift;
|
Fix big left-shifts of unsigned char
Shifting 'unsigned char' or 'unsigned short' left can result in sign
extension errors, since the C integer promotion rules means that the
unsigned char/short will get implicitly promoted to a signed 'int' due to
the shift (or due to other operations).
This normally doesn't matter, but if you shift things up sufficiently, it
will now set the sign bit in 'int', and a subsequent cast to a bigger type
(eg 'long' or 'unsigned long') will now sign-extend the value despite the
original expression being unsigned.
One example of this would be something like
unsigned long size;
unsigned char c;
size += c << 24;
where despite all the variables being unsigned, 'c << 24' ends up being a
signed entity, and will get sign-extended when then doing the addition in
an 'unsigned long' type.
Since git uses 'unsigned char' pointers extensively, we actually have this
bug in a couple of places.
I may have missed some, but this is the result of looking at
git grep '[^0-9 ][ ]*<<[ ][a-z]' -- '*.c' '*.h'
git grep '<<[ ]*24'
which catches at least the common byte cases (shifting variables by a
variable amount, and shifting by 24 bits).
I also grepped for just 'unsigned char' variables in general, and
converted the ones that most obviously ended up getting implicitly cast
immediately anyway (eg hash_name(), encode_85()).
In addition to just avoiding 'unsigned char', this patch also tries to use
a common idiom for the delta header size thing. We had three different
variations on it: "& 0x7fUL" in one place (getting the sign extension
right), and "& ~0x80" and "& 0x7f" in two other places (not getting it
right). Apart from making them all just avoid using "unsigned char" at
all, I also unified them to then use a simple "& 0x7f".
I considered making a sparse extension which warns about doing implicit
casts from unsigned types to signed types, but it gets rather complex very
quickly, so this is just a hack.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-18 00:22:27 +00:00
|
|
|
unsigned char *pack;
|
|
|
|
unsigned long size, c;
|
2005-06-29 03:34:23 +00:00
|
|
|
enum object_type type;
|
2005-06-25 22:59:31 +00:00
|
|
|
|
2006-09-21 04:07:39 +00:00
|
|
|
obj_list[nr].offset = consumed_bytes;
|
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
pack = fill(1);
|
|
|
|
c = *pack;
|
|
|
|
use(1);
|
2005-06-28 21:21:02 +00:00
|
|
|
type = (c >> 4) & 7;
|
|
|
|
size = (c & 15);
|
2005-06-29 05:15:57 +00:00
|
|
|
shift = 4;
|
2005-06-28 21:21:02 +00:00
|
|
|
while (c & 0x80) {
|
2005-06-29 03:34:23 +00:00
|
|
|
pack = fill(1);
|
2006-09-21 04:07:39 +00:00
|
|
|
c = *pack;
|
2005-06-29 03:34:23 +00:00
|
|
|
use(1);
|
2005-06-29 05:15:57 +00:00
|
|
|
size += (c & 0x7f) << shift;
|
|
|
|
shift += 7;
|
2005-06-28 21:21:02 +00:00
|
|
|
}
|
2007-04-18 18:27:45 +00:00
|
|
|
|
2005-06-28 21:21:02 +00:00
|
|
|
switch (type) {
|
|
|
|
case OBJ_COMMIT:
|
|
|
|
case OBJ_TREE:
|
|
|
|
case OBJ_BLOB:
|
|
|
|
case OBJ_TAG:
|
2006-09-21 04:07:39 +00:00
|
|
|
unpack_non_delta_entry(type, size, nr);
|
2005-06-28 21:21:02 +00:00
|
|
|
return;
|
2006-09-21 04:06:49 +00:00
|
|
|
case OBJ_REF_DELTA:
|
2006-09-21 04:07:39 +00:00
|
|
|
case OBJ_OFS_DELTA:
|
|
|
|
unpack_delta_entry(type, size, nr);
|
2005-06-28 21:21:02 +00:00
|
|
|
return;
|
2005-06-29 03:34:23 +00:00
|
|
|
default:
|
2006-09-04 05:55:54 +00:00
|
|
|
error("bad object type %d", type);
|
|
|
|
has_errors = 1;
|
2006-09-13 19:59:20 +00:00
|
|
|
if (recover)
|
2006-09-04 05:55:54 +00:00
|
|
|
return;
|
|
|
|
exit(1);
|
2005-06-25 22:59:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unpack_all(void)
|
|
|
|
{
|
2005-06-29 03:34:23 +00:00
|
|
|
int i;
|
2007-10-30 18:57:32 +00:00
|
|
|
struct progress *progress = NULL;
|
2005-06-29 03:34:23 +00:00
|
|
|
struct pack_header *hdr = fill(sizeof(struct pack_header));
|
2008-02-25 21:46:11 +00:00
|
|
|
|
|
|
|
nr_objects = ntohl(hdr->hdr_entries);
|
2005-06-29 03:34:23 +00:00
|
|
|
|
|
|
|
if (ntohl(hdr->hdr_signature) != PACK_SIGNATURE)
|
|
|
|
die("bad pack file");
|
2006-02-09 22:50:04 +00:00
|
|
|
if (!pack_version_ok(hdr->hdr_version))
|
2008-07-03 15:52:09 +00:00
|
|
|
die("unknown pack file version %"PRIu32,
|
|
|
|
ntohl(hdr->hdr_version));
|
2007-04-18 18:27:45 +00:00
|
|
|
use(sizeof(struct pack_header));
|
2005-06-29 03:34:23 +00:00
|
|
|
|
2007-04-20 18:10:07 +00:00
|
|
|
if (!quiet)
|
2007-10-30 18:57:32 +00:00
|
|
|
progress = start_progress("Unpacking objects", nr_objects);
|
2008-10-06 23:39:10 +00:00
|
|
|
obj_list = xcalloc(nr_objects, sizeof(*obj_list));
|
2007-04-18 18:27:45 +00:00
|
|
|
for (i = 0; i < nr_objects; i++) {
|
|
|
|
unpack_one(i);
|
2007-10-30 18:57:33 +00:00
|
|
|
display_progress(progress, i + 1);
|
2007-04-18 18:27:45 +00:00
|
|
|
}
|
2007-10-30 18:57:33 +00:00
|
|
|
stop_progress(&progress);
|
2007-04-18 18:27:45 +00:00
|
|
|
|
2005-06-29 03:34:23 +00:00
|
|
|
if (delta_list)
|
|
|
|
die("unresolved deltas left after unpacking");
|
2005-06-25 22:59:31 +00:00
|
|
|
}
|
|
|
|
|
2006-08-03 15:24:37 +00:00
|
|
|
int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
|
2005-06-25 22:27:14 +00:00
|
|
|
{
|
|
|
|
int i;
|
2005-06-29 03:34:23 +00:00
|
|
|
unsigned char sha1[20];
|
2005-06-25 22:27:14 +00:00
|
|
|
|
2009-01-23 09:07:46 +00:00
|
|
|
read_replace_refs = 0;
|
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2005-11-26 08:50:02 +00:00
|
|
|
|
2006-01-07 02:53:16 +00:00
|
|
|
quiet = !isatty(2);
|
|
|
|
|
2005-06-25 22:27:14 +00:00
|
|
|
for (i = 1 ; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
|
|
|
if (*arg == '-') {
|
2005-06-25 22:59:31 +00:00
|
|
|
if (!strcmp(arg, "-n")) {
|
|
|
|
dry_run = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-09 17:43:02 +00:00
|
|
|
if (!strcmp(arg, "-q")) {
|
|
|
|
quiet = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2006-09-04 05:55:54 +00:00
|
|
|
if (!strcmp(arg, "-r")) {
|
2006-09-13 19:59:20 +00:00
|
|
|
recover = 1;
|
2006-09-04 05:55:54 +00:00
|
|
|
continue;
|
|
|
|
}
|
2008-02-25 21:46:11 +00:00
|
|
|
if (!strcmp(arg, "--strict")) {
|
|
|
|
strict = 1;
|
|
|
|
continue;
|
|
|
|
}
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 09:53:29 +00:00
|
|
|
if (!prefixcmp(arg, "--pack_header=")) {
|
2006-11-01 22:06:20 +00:00
|
|
|
struct pack_header *hdr;
|
|
|
|
char *c;
|
|
|
|
|
|
|
|
hdr = (struct pack_header *)buffer;
|
|
|
|
hdr->hdr_signature = htonl(PACK_SIGNATURE);
|
|
|
|
hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10));
|
|
|
|
if (*c != ',')
|
|
|
|
die("bad %s", arg);
|
|
|
|
hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
|
|
|
|
if (*c)
|
|
|
|
die("bad %s", arg);
|
|
|
|
len = sizeof(*hdr);
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-25 22:27:14 +00:00
|
|
|
usage(unpack_usage);
|
|
|
|
}
|
2005-06-29 03:34:23 +00:00
|
|
|
|
|
|
|
/* We don't take any non-flag arguments now.. Maybe some day */
|
2005-06-25 22:27:14 +00:00
|
|
|
usage(unpack_usage);
|
2005-06-29 03:34:23 +00:00
|
|
|
}
|
2008-10-01 18:05:20 +00:00
|
|
|
git_SHA1_Init(&ctx);
|
2005-06-25 22:59:31 +00:00
|
|
|
unpack_all();
|
2008-10-01 18:05:20 +00:00
|
|
|
git_SHA1_Update(&ctx, buffer, offset);
|
|
|
|
git_SHA1_Final(sha1, &ctx);
|
2008-02-25 21:46:11 +00:00
|
|
|
if (strict)
|
|
|
|
write_rest();
|
2006-08-17 18:54:57 +00:00
|
|
|
if (hashcmp(fill(20), sha1))
|
2005-06-29 03:34:23 +00:00
|
|
|
die("final sha1 did not match");
|
|
|
|
use(20);
|
|
|
|
|
|
|
|
/* Write the last part of the buffer to stdout */
|
|
|
|
while (len) {
|
2005-12-20 00:18:28 +00:00
|
|
|
int ret = xwrite(1, buffer + offset, len);
|
|
|
|
if (ret <= 0)
|
2005-06-29 03:34:23 +00:00
|
|
|
break;
|
|
|
|
len -= ret;
|
|
|
|
offset += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* All done */
|
2006-09-04 05:55:54 +00:00
|
|
|
return has_errors;
|
2005-06-25 22:27:14 +00:00
|
|
|
}
|