X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=csum-file.c;h=c66b9eb10bfad8fee8b7b779cbb4a8e7c86480af;hb=0dd276b8713a484496a2ef694b6c72b1ddbef08b;hp=9f9553ae035e762d12dc7d885432abd920af6e5b;hpb=e18088451d92fbf83bfb57fd48201eda117f8103;p=git.git

diff --git a/csum-file.c b/csum-file.c
index 9f9553ae..c66b9eb1 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -45,6 +45,7 @@ int sha1close(struct sha1file *f, unsigned char *result, int 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,6 +59,7 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
 		memcpy(f->buffer + offset, buf, nr);
 		count -= nr;
 		offset += nr;
+		buf += nr;
 		left -= nr;
 		if (!left) {
 			SHA1_Update(&f->ctx, f->buffer, offset);
@@ -85,7 +87,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;
@@ -95,6 +97,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;