X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=sha1_file.c;h=edbf9f9a84602c9d7b0f8064a943bdc83344c728;hb=d6db01075b65da2b8584a0450619390893aae103;hp=942b673dc3c7fa9f057c5c452e3a1b73eaeb8707;hpb=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git

diff --git a/sha1_file.c b/sha1_file.c
index 942b673d..edbf9f9a 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -9,6 +9,7 @@
 #include <stdarg.h>
 #include <limits.h>
 #include "cache.h"
+#include "delta.h"
 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@ -44,7 +45,7 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
 	return 0;
 }
 
-int get_sha1_file(const char *path, unsigned char *result)
+static int get_sha1_file(const char *path, unsigned char *result)
 {
 	char buffer[60];
 	int fd = open(path, O_RDONLY);
@@ -199,7 +200,7 @@ static void prepare_alt_odb(void)
 {
 	int pass, totlen, i;
 	const char *cp, *last;
-	char *op = 0;
+	char *op = NULL;
 	const char *alt = gitenv(ALTERNATE_DB_ENVIRONMENT) ? : "";
 
 	/* The first pass counts how large an area to allocate to
@@ -236,7 +237,7 @@ static void prepare_alt_odb(void)
 		if (pass)
 			break;
 		alt_odb = xmalloc(sizeof(*alt_odb) * (i + 1) + totlen);
-		alt_odb[i].base = alt_odb[i].name = 0;
+		alt_odb[i].base = alt_odb[i].name = NULL;
 		op = (char*)(&alt_odb[i+1]);
 	}
 }
@@ -313,13 +314,13 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
 	int ret, bytes;
 	z_stream stream;
 	char buffer[8192];
-	char *buf;
+	unsigned char *buf;
 
 	/* Get the data stream */
 	memset(&stream, 0, sizeof(stream));
 	stream.next_in = map;
 	stream.avail_in = mapsize;
-	stream.next_out = buffer;
+	stream.next_out = (unsigned char *)buffer;
 	stream.avail_out = sizeof(buffer);
 
 	inflateInit(&stream);
@@ -353,13 +354,26 @@ void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size
 	if (map) {
 		buf = unpack_sha1_file(map, mapsize, type, size);
 		munmap(map, mapsize);
+		if (buf && !strcmp(type, "delta")) {
+			void *ref = NULL, *delta = buf;
+			unsigned long ref_size, delta_size = *size;
+			buf = NULL;
+			if (delta_size > 20)
+				ref = read_sha1_file(delta, type, &ref_size);
+			if (ref)
+				buf = patch_delta(ref, ref_size,
+						  delta+20, delta_size-20, 
+						  size);
+			free(delta);
+			free(ref);
+		}
 		return buf;
 	}
 	return NULL;
 }
 
 void *read_object_with_reference(const unsigned char *sha1,
-				 const unsigned char *required_type,
+				 const char *required_type,
 				 unsigned long *size,
 				 unsigned char *actual_sha1_return)
 {
@@ -403,20 +417,20 @@ void *read_object_with_reference(const unsigned char *sha1,
 	}
 }
 
-int write_sha1_file(char *buf, unsigned long len, const char *type, unsigned char *returnsha1)
+int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *returnsha1)
 {
 	int size;
-	char *compressed;
+	unsigned char *compressed;
 	z_stream stream;
 	unsigned char sha1[20];
 	SHA_CTX c;
 	char *filename;
 	static char tmpfile[PATH_MAX];
-	char hdr[50];
+	unsigned char hdr[50];
 	int fd, hdrlen, ret;
 
 	/* Generate the header */
-	hdrlen = sprintf(hdr, "%s %lu", type, len)+1;
+	hdrlen = sprintf((char *)hdr, "%s %lu", type, len)+1;
 
 	/* Sha1.. */
 	SHA1_Init(&c);
@@ -516,8 +530,8 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd)
 	int local;
 	z_stream stream;
 	unsigned char real_sha1[20];
-	char buf[4096];
-	char discard[4096];
+	unsigned char buf[4096];
+	unsigned char discard[4096];
 	int ret;
 	SHA_CTX c;