X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=test-delta.c;h=3d885ff37ee7fc43dec05dd827679d68cee5516b;hb=60b188a9844cdcf865174c685a38acc053a9d43b;hp=37ef86b283c2378017f1fc6bff05cc33fb25d7aa;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git

diff --git a/test-delta.c b/test-delta.c
index 37ef86b28..3d885ff37 100644
--- a/test-delta.c
+++ b/test-delta.c
@@ -8,16 +8,11 @@
  * 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"
+#include "cache.h"
 
-static const char *usage =
+static const char usage_str[] =
 	"test-delta (-d|-p) <from_file> <data_file> <out_file>";
 
 int main(int argc, char *argv[])
@@ -28,7 +23,7 @@ int main(int argc, char *argv[])
 	unsigned long from_size, data_size, out_size;
 
 	if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) {
-		fprintf(stderr, "Usage: %s\n", usage);
+		fprintf(stderr, "Usage: %s\n", usage_str);
 		return 1;
 	}
 
@@ -41,6 +36,7 @@ int main(int argc, char *argv[])
 	from_buf = mmap(NULL, from_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (from_buf == MAP_FAILED) {
 		perror(argv[2]);
+		close(fd);
 		return 1;
 	}
 	close(fd);
@@ -54,6 +50,7 @@ int main(int argc, char *argv[])
 	data_buf = mmap(NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (data_buf == MAP_FAILED) {
 		perror(argv[3]);
+		close(fd);
 		return 1;
 	}
 	close(fd);
@@ -72,7 +69,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;
 	}