t4018-diff-funcname: demonstrate end of line funcname matching flaw

diff --git a/csum-file.c b/csum-file.c
index 3729e73e19e18a78c15fb90dfc28133f541176ef..cfc1ac42b9fc9489237cd0bcd1652fb4df243512 100644 (file)
--- a/csum-file.c
+++ b/csum-file.c
@@ -11,14 +11,15 @@
 #include "progress.h"
 #include "csum-file.h"
 
-static void sha1flush(struct sha1file *f, unsigned int count)
+static void flush(struct sha1file *f, unsigned int count)
 {
        void *buf = f->buffer;
 
        for (;;) {
                int ret = xwrite(f->fd, buf, count);
                if (ret > 0) {
-                       display_throughput(f->tp, ret);
+                       f->total += ret;
+                       display_throughput(f->tp, f->total);
                        buf = (char *) buf + ret;
                        count -= ret;
                        if (count)
@@ -31,21 +32,30 @@ static void sha1flush(struct sha1file *f, unsigned int count)
        }
 }
 
-int sha1close(struct sha1file *f, unsigned char *result, int final)
+void sha1flush(struct sha1file *f)
 {
-       int fd;
        unsigned offset = f->offset;
+
        if (offset) {
                SHA1_Update(&f->ctx, f->buffer, offset);
-               sha1flush(f, offset);
+               flush(f, offset);
                f->offset = 0;
        }
-       if (final) {
+}
+
+int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
+{
+       int fd;
+
+       sha1flush(f);
+       SHA1_Final(f->buffer, &f->ctx);
+       if (result)
+               hashcpy(result, f->buffer);
+       if (flags & (CSUM_CLOSE | CSUM_FSYNC)) {
                /* write checksum and close fd */
-               SHA1_Final(f->buffer, &f->ctx);
-               if (result)
-                       hashcpy(result, f->buffer);
-               sha1flush(f, 20);
+               flush(f, 20);
+               if (flags & CSUM_FSYNC)
+                       fsync_or_die(f->fd, f->name);
                if (close(f->fd))
                        die("%s: sha1 file error on close (%s)",
                            f->name, strerror(errno));
@@ -72,7 +82,7 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
                left -= nr;
                if (!left) {
                        SHA1_Update(&f->ctx, f->buffer, offset);
-                       sha1flush(f, offset);
+                       flush(f, offset);
                        offset = 0;
                }
                f->offset = offset;
@@ -87,21 +97,12 @@ struct sha1file *sha1fd(int fd, const char *name)
 
 struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp)
 {
-       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);
-
+       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;