X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=csum-file.c;h=b7174c6c056c5a8f2a800ecbcb3cdf304c0bfc3f;hb=fc61e313da0a124e9f6a213cd76944a8c4e6c918;hp=3ab65b7515d5a4cb9c8d9b6c4f8eb32121d3c628;hpb=2700628e64939c9496f8ca532b7c188e5927d500;p=git.git

diff --git a/csum-file.c b/csum-file.c
index 3ab65b751..b7174c6c0 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -10,23 +10,21 @@
 #include "cache.h"
 #include "csum-file.h"
 
-static int sha1flush(struct sha1file *f, unsigned int count)
+static void sha1flush(struct sha1file *f, unsigned int count)
 {
 	void *buf = f->buffer;
 
 	for (;;) {
-		int ret = write(f->fd, buf, count);
+		int ret = xwrite(f->fd, buf, count);
 		if (ret > 0) {
-			buf += ret;
+			buf = (char *) buf + ret;
 			count -= ret;
 			if (count)
 				continue;
-			return 0;
+			return;
 		}
 		if (!ret)
 			die("sha1 file '%s' write error. Out of diskspace", f->name);
-		if (errno == EAGAIN || errno == EINTR)
-			continue;
 		die("sha1 file '%s' write error (%s)", f->name, strerror(errno));
 	}
 }
@@ -40,11 +38,12 @@ int sha1close(struct sha1file *f, unsigned char *result, int update)
 	}
 	SHA1_Final(f->buffer, &f->ctx);
 	if (result)
-		memcpy(result, f->buffer, 20);
+		hashcpy(result, f->buffer);
 	if (update)
 		sha1flush(f, 20);
 	if (close(f->fd))
 		die("%s: sha1 file error on close (%s)", f->name, strerror(errno));
+	free(f);
 	return 0;
 }
 
@@ -58,7 +57,7 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
 		memcpy(f->buffer + offset, buf, nr);
 		count -= nr;
 		offset += nr;
-		buf += nr;
+		buf = (char *) buf + nr;
 		left -= nr;
 		if (!left) {
 			SHA1_Update(&f->ctx, f->buffer, offset);
@@ -86,7 +85,7 @@ struct sha1file *sha1create(const char *fmt, ...)
 		die("you wascally wabbit, you");
 	f->namelen = len;
 
-	fd = open(f->name, O_CREAT | O_EXCL | O_WRONLY, 0644);
+	fd = open(f->name, O_CREAT | O_EXCL | O_WRONLY, 0666);
 	if (fd < 0)
 		die("unable to open %s (%s)", f->name, strerror(errno));
 	f->fd = fd;
@@ -96,6 +95,26 @@ struct sha1file *sha1create(const char *fmt, ...)
 	return f;
 }
 
+struct sha1file *sha1fd(int fd, const char *name)
+{
+	struct sha1file *f;
+	unsigned len;
+
+	f = xmalloc(sizeof(*f));
+
+	len = strlen(name);
+	if (len >= PATH_MAX)
+		die("you wascally wabbit, you");
+	f->namelen = len;
+	memcpy(f->name, name, len+1);
+
+	f->fd = fd;
+	f->error = 0;
+	f->offset = 0;
+	SHA1_Init(&f->ctx);
+	return f;
+}
+
 int sha1write_compressed(struct sha1file *f, void *in, unsigned int size)
 {
 	z_stream stream;
@@ -103,7 +122,7 @@ int sha1write_compressed(struct sha1file *f, void *in, unsigned int size)
 	void *out;
 
 	memset(&stream, 0, sizeof(stream));
-	deflateInit(&stream, Z_DEFAULT_COMPRESSION);
+	deflateInit(&stream, zlib_compression_level);
 	maxsize = deflateBound(&stream, size);
 	out = xmalloc(maxsize);