summaryrefslogtreecommitdiff
path: root/csum-file.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-10-16 21:55:48 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-10-17 02:54:56 -0400
commit7ba502c47bda21d060844863991083f4c319d436 (patch)
tree200952ea673cdf589e161de938c2012c5351de72 /csum-file.c
parent2f8b89472cec19a530cb697c4ee20e0ddfd747f6 (diff)
downloadgit-7ba502c47bda21d060844863991083f4c319d436.tar.gz
pack-objects.c: fix some global variable abuse and memory leaks
To keep things well layered, sha1close() now returns the file descriptor when it doesn't close the file. An ugly cast was added to the return of write_idx_file() to avoid a warning. A proper fix will come separately. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'csum-file.c')
-rw-r--r--csum-file.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/csum-file.c b/csum-file.c
index 9ab997120d..9929991dea 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -31,22 +31,27 @@ static void sha1flush(struct sha1file *f, unsigned int count)
int sha1close(struct sha1file *f, unsigned char *result, int final)
{
+ int fd;
unsigned offset = f->offset;
if (offset) {
SHA1_Update(&f->ctx, f->buffer, offset);
sha1flush(f, offset);
f->offset = 0;
}
- if (!final)
- return 0; /* only want to flush (no checksum write, no close) */
- SHA1_Final(f->buffer, &f->ctx);
- if (result)
- hashcpy(result, f->buffer);
- sha1flush(f, 20);
- if (close(f->fd))
- die("%s: sha1 file error on close (%s)", f->name, strerror(errno));
+ if (final) {
+ /* write checksum and close fd */
+ SHA1_Final(f->buffer, &f->ctx);
+ if (result)
+ hashcpy(result, f->buffer);
+ sha1flush(f, 20);
+ if (close(f->fd))
+ die("%s: sha1 file error on close (%s)",
+ f->name, strerror(errno));
+ fd = 0;
+ } else
+ fd = f->fd;
free(f);
- return 0;
+ return fd;
}
int sha1write(struct sha1file *f, void *buf, unsigned int count)