Update draft release notes for 1.5.4

diff --git a/csum-file.c b/csum-file.c
index 9ab997120d04c5be0aa9d3ff3ba090ba12b7bec8..9728a9954129246b96713d2f3b8dbd52541c416b 100644 (file)
--- a/csum-file.c
+++ b/csum-file.c
@@ -8,6 +8,7 @@
  * able to verify hasn't been messed with afterwards.
  */
 #include "cache.h"
+#include "progress.h"
 #include "csum-file.h"
 
 static void sha1flush(struct sha1file *f, unsigned int count)
@@ -17,6 +18,8 @@ static void sha1flush(struct sha1file *f, unsigned int count)
        for (;;) {
                int ret = xwrite(f->fd, buf, count);
                if (ret > 0) {
+                       f->total += ret;
+                       display_throughput(f->tp, f->total);
                        buf = (char *) buf + ret;
                        count -= ret;
                        if (count)
@@ -31,22 +34,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)
@@ -75,20 +83,17 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
 
 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);
+       return sha1fd_throughput(fd, name, NULL);
+}
 
+struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp)
+{
+       struct sha1file *f = xmalloc(sizeof(*f));
        f->fd = fd;
-       f->error = 0;
        f->offset = 0;
+       f->total = 0;
+       f->tp = tp;
+       f->name = name;
        f->do_crc = 0;
        SHA1_Init(&f->ctx);
        return f;