X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=csum-file.c;h=5f9249aeedfa7d4156cf412da6a7e7d77f33ff86;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=c8c7369152cd2b744aae488eb794c12ffbdfe9b9;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git

diff --git a/csum-file.c b/csum-file.c
index c8c73691..5f9249ae 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -15,7 +15,7 @@ static int 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;
 			count -= ret;
@@ -25,8 +25,6 @@ static int sha1flush(struct sha1file *f, unsigned int count)
 		}
 		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));
 	}
 }
@@ -45,6 +43,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;
 }
 
@@ -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;