mirror of
https://github.com/git/git.git
synced 2024-12-11 19:03:50 +08:00
a64acf7298
The last several commits were geared at replacing the include of cache.h
in strbuf.c with an include of git-compat-util.h. Unfortunately, I had
to drop a patch moving some functions from cache.h to object-name.h, due
to excessive conflicts with other in-flight topics.
However, even without that patch, the series of patches so far allows us
to modify a number of C files to replace an include of cache.h with
git-compat-util.h. Do that to reduce our dependencies.
(If we could have kept our object-name.h patch in this series, it would
have also let us reduce the includes in checkout.c and fmt-merge-msg.c
in addition to strbuf.c).
Just to ensure that nothing else was bringing in cache.h, all of the
affected files have been checked to ensure that
gcc -E -I. $SOURCE_FILE | grep '"cache.h"'
found no hits and that
make DEVELOPER=1 ${OBJECT_FILE_FOR_SOURCE_FILE}
successfully compiles without warnings.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
87 lines
1.9 KiB
C
87 lines
1.9 KiB
C
/*
|
|
* test-delta.c: test code to exercise diff-delta.c and patch-delta.c
|
|
*
|
|
* (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 "test-tool.h"
|
|
#include "git-compat-util.h"
|
|
#include "delta.h"
|
|
#include "wrapper.h"
|
|
|
|
static const char usage_str[] =
|
|
"test-tool delta (-d|-p) <from_file> <data_file> <out_file>";
|
|
|
|
int cmd__delta(int argc, const char **argv)
|
|
{
|
|
int fd;
|
|
struct stat st;
|
|
void *from_buf = NULL, *data_buf = NULL, *out_buf = NULL;
|
|
unsigned long from_size, data_size, out_size;
|
|
int ret = 1;
|
|
|
|
if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) {
|
|
fprintf(stderr, "usage: %s\n", usage_str);
|
|
return 1;
|
|
}
|
|
|
|
fd = open(argv[2], O_RDONLY);
|
|
if (fd < 0 || fstat(fd, &st)) {
|
|
perror(argv[2]);
|
|
return 1;
|
|
}
|
|
from_size = st.st_size;
|
|
from_buf = xmalloc(from_size);
|
|
if (read_in_full(fd, from_buf, from_size) < 0) {
|
|
perror(argv[2]);
|
|
close(fd);
|
|
goto cleanup;
|
|
}
|
|
close(fd);
|
|
|
|
fd = open(argv[3], O_RDONLY);
|
|
if (fd < 0 || fstat(fd, &st)) {
|
|
perror(argv[3]);
|
|
goto cleanup;
|
|
}
|
|
data_size = st.st_size;
|
|
data_buf = xmalloc(data_size);
|
|
if (read_in_full(fd, data_buf, data_size) < 0) {
|
|
perror(argv[3]);
|
|
close(fd);
|
|
goto cleanup;
|
|
}
|
|
close(fd);
|
|
|
|
if (argv[1][1] == 'd')
|
|
out_buf = diff_delta(from_buf, from_size,
|
|
data_buf, data_size,
|
|
&out_size, 0);
|
|
else
|
|
out_buf = patch_delta(from_buf, from_size,
|
|
data_buf, data_size,
|
|
&out_size);
|
|
if (!out_buf) {
|
|
fprintf(stderr, "delta operation failed (returned NULL)\n");
|
|
goto cleanup;
|
|
}
|
|
|
|
fd = open (argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666);
|
|
if (fd < 0 || write_in_full(fd, out_buf, out_size) < 0) {
|
|
perror(argv[4]);
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = 0;
|
|
cleanup:
|
|
free(from_buf);
|
|
free(data_buf);
|
|
free(out_buf);
|
|
|
|
return ret;
|
|
}
|