Make clear_commit_marks() clean harder

diff --git a/csum-file.c b/csum-file.c
index 98cb59ddda86386a4255f3c3d8ee951a415d7d70..ebaad0397f0bce50db7542abb904ba42b6173344 100644 (file)
--- a/csum-file.c
+++ b/csum-file.c
@@ -15,23 +15,21 @@ 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;
+                       buf = (char *) buf + ret;
                        count -= ret;
                        if (count)
                                continue;
                        return 0;
                }
                if (!ret)
-                       die("sha1 file write error. Out of diskspace");
-               if (errno == EAGAIN || errno == EINTR)
-                       continue;
-               die("sha1 file write error (%s)", strerror(errno));
+                       die("sha1 file '%s' write error. Out of diskspace", f->name);
+               die("sha1 file '%s' write error (%s)", f->name, strerror(errno));
        }
 }
 
-int sha1close(struct sha1file *f)
+int sha1close(struct sha1file *f, unsigned char *result, int update)
 {
        unsigned offset = f->offset;
        if (offset) {
@@ -39,7 +37,13 @@ int sha1close(struct sha1file *f)
                sha1flush(f, offset);
        }
        SHA1_Final(f->buffer, &f->ctx);
-       sha1flush(f, 20);
+       if (result)
+               memcpy(result, f->buffer, 20);
+       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;
 }
 
@@ -53,6 +57,7 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
                memcpy(f->buffer + offset, buf, nr);
                count -= nr;
                offset += nr;
+               buf = (char *) buf + nr;
                left -= nr;
                if (!left) {
                        SHA1_Update(&f->ctx, f->buffer, offset);
@@ -66,22 +71,43 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
 
 struct sha1file *sha1create(const char *fmt, ...)
 {
-       static char filename[PATH_MAX];
        struct sha1file *f;
        unsigned len;
        va_list arg;
        int fd;
 
+       f = xmalloc(sizeof(*f));
+
        va_start(arg, fmt);
-       len = vsnprintf(filename, PATH_MAX, fmt, arg);
+       len = vsnprintf(f->name, sizeof(f->name), fmt, arg);
        va_end(arg);
-
        if (len >= PATH_MAX)
                die("you wascally wabbit, you");
-       fd = open(filename, O_CREAT | O_EXCL | O_WRONLY, 0644);
+       f->namelen = len;
+
+       fd = open(f->name, O_CREAT | O_EXCL | O_WRONLY, 0666);
        if (fd < 0)
-               die("unable to open %s (%s)", filename, strerror(errno));
+               die("unable to open %s (%s)", f->name, strerror(errno));
+       f->fd = fd;
+       f->error = 0;
+       f->offset = 0;
+       SHA1_Init(&f->ctx);
+       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;