Make 'git var GIT_PAGER' always print the configured pager

diff --git a/test-delta.c b/test-delta.c
index da51efc245c4f6b543a5695d402c902a3c343779..af40a3c49ee0df5f0caaebae8e9bc6e9ffdb092b 100644 (file)
--- a/test-delta.c
+++ b/test-delta.c
@@ -1,23 +1,18 @@
 /*
  * test-delta.c: test code to exercise diff-delta.c and patch-delta.c
  *
- * (C) 2005 Nicolas Pitre <nico@cam.org>
+ * (C) 2005 Nicolas Pitre <nico@fluxnic.net>
  *
  * This code is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * 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);
@@ -61,7 +58,7 @@ int main(int argc, char *argv[])
        if (argv[1][1] == 'd')
                out_buf = diff_delta(from_buf, from_size,
                                     data_buf, data_size,
-                                    &out_size, ~0UL);
+                                    &out_size, 0);
        else
                out_buf = patch_delta(from_buf, from_size,
                                      data_buf, data_size,
@@ -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;
        }