Merge branch 'maint'

diff --git a/test-delta.c b/test-delta.c
index cc05794ec0b69aa2a05f7d02a412e18c87687047..16595ef0a9022b1a9c677a36205526eb3567a93d 100644 (file)
--- a/test-delta.c
+++ b/test-delta.c
@@ -8,13 +8,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
+#include "git-compat-util.h"
 #include "delta.h"
 
 static const char usage[] =
@@ -38,10 +32,7 @@ int main(int argc, char *argv[])
                return 1;
        }
        from_size = st.st_size;
-       if (from_size)
-               from_buf = mmap(NULL, from_size, PROT_READ, MAP_PRIVATE, fd, 0);
-       else
-               from_buf = "";
+       from_buf = mmap(NULL, from_size, PROT_READ, MAP_PRIVATE, fd, 0);
        if (from_buf == MAP_FAILED) {
                perror(argv[2]);
                close(fd);
@@ -55,11 +46,7 @@ int main(int argc, char *argv[])
                return 1;
        }
        data_size = st.st_size;
-
-       if (data_size)
-               data_buf = mmap(NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0);
-       else
-               data_buf = "";
+       data_buf = mmap(NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0);
        if (data_buf == MAP_FAILED) {
                perror(argv[3]);
                close(fd);
@@ -81,7 +68,7 @@ int main(int argc, char *argv[])
        }
 
        fd = open (argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666);
-       if (fd < 0 || write(fd, out_buf, out_size) != out_size) {
+       if (fd < 0 || write_in_full(fd, out_buf, out_size) != out_size) {
                perror(argv[4]);
                return 1;
        }