summaryrefslogtreecommitdiff
path: root/csum-file.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 05:01:46 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 05:01:46 (GMT)
commite18088451d92fbf83bfb57fd48201eda117f8103 (patch)
tree718ae283382872ae99ce7b49406679b0d3f498ab /csum-file.h
parentc38138cd78f284b261a02323e8f18a1dee87c7fa (diff)
downloadgit-e18088451d92fbf83bfb57fd48201eda117f8103.zip
git-e18088451d92fbf83bfb57fd48201eda117f8103.tar.gz
git-e18088451d92fbf83bfb57fd48201eda117f8103.tar.bz2
csum-file interface updates: return resulting SHA1
Also, make the writing of the SHA1 as a end-header be conditional: not every user will necessarily want to write the SHA1 to the file itself, even though current users do (but we migh end up using the same helper functions for the object files themselves, that don't do this). This also makes the packed index file contain the SHA1 of the packed data file at the end (just before its own SHA1). That way you can validate the pairing of the two if you want to.
Diffstat (limited to 'csum-file.h')
-rw-r--r--csum-file.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/csum-file.h b/csum-file.h
index 1086f04..2b6c8dc 100644
--- a/csum-file.h
+++ b/csum-file.h
@@ -4,13 +4,14 @@
/* A SHA1-protected file */
struct sha1file {
int fd, error;
- unsigned long offset;
+ unsigned int offset, namelen;
SHA_CTX ctx;
+ char name[PATH_MAX];
unsigned char buffer[8192];
};
extern struct sha1file *sha1create(const char *fmt, ...);
-extern int sha1close(struct sha1file *);
+extern int sha1close(struct sha1file *, unsigned char *, int);
extern int sha1write(struct sha1file *, void *, unsigned int);
extern int sha1write_compressed(struct sha1file *, void *, unsigned int);