admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hl/test-helper-fd-close'

Browse Source 
A few file descriptors left unclosed upon program completion in a
few test helper programs are now closed.

* hl/test-helper-fd-close:
  test-delta: close output descriptor after use
  test-delta: use strbufs to hold input files
  test-delta: handle errors with die()
  t/helper/test-truncate: close file descriptor after truncation
This commit is contained in:
Junio C Hamano
2025-08-03 18:44:27 -07:00
parent f61d8ce526 0f1b33815b
commit 750a95ba3f
2 changed files with 27 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
t/helper/test-delta.c
View File

@@ -11,6 +11,7 @@
#include "test-tool.h" #include "test-tool.h"
#include "git-compat-util.h" #include "git-compat-util.h"
#include "delta.h" #include "delta.h"
#include "strbuf.h"
static const char usage_str[] = static const char usage_str[] =
"test-tool delta (-d|-p) <from_file> <data_file> <out_file>"; "test-tool delta (-d|-p) <from_file> <data_file> <out_file>";
@@ -18,68 +19,38 @@ static const char usage_str[] =
int cmd__delta(int argc, const char **argv) int cmd__delta(int argc, const char **argv)
{ {
int fd; int fd;
struct stat st; struct strbuf from = STRBUF_INIT, data = STRBUF_INIT;
void *from_buf = NULL, *data_buf = NULL, *out_buf = NULL; char *out_buf;
unsigned long from_size, data_size, out_size; unsigned long out_size;
int ret = 1;
if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) { if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p")))
fprintf(stderr, "usage: %s\n", usage_str); usage(usage_str);
return 1;
}
fd = open(argv[2], O_RDONLY); if (strbuf_read_file(&from, argv[2], 0) < 0)
if (fd < 0 || fstat(fd, &st)) { die_errno("unable to read '%s'", argv[2]);
perror(argv[2]); if (strbuf_read_file(&data, argv[3], 0) < 0)
return 1; die_errno("unable to read '%s'", argv[3]);
}
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') if (argv[1][1] == 'd')
out_buf = diff_delta(from_buf, from_size, out_buf = diff_delta(from.buf, from.len,
data_buf, data_size, data.buf, data.len,
&out_size, 0); &out_size, 0);
else else
out_buf = patch_delta(from_buf, from_size, out_buf = patch_delta(from.buf, from.len,
data_buf, data_size, data.buf, data.len,
&out_size); &out_size);
if (!out_buf) { if (!out_buf)
fprintf(stderr, "delta operation failed (returned NULL)\n"); die("delta operation failed (returned NULL)");
goto cleanup;
}
fd = open (argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666); fd = xopen(argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666);
if (fd < 0 || write_in_full(fd, out_buf, out_size) < 0) { if (write_in_full(fd, out_buf, out_size) < 0)
perror(argv[4]); die_errno("write(%s)", argv[4]);
goto cleanup; if (close(fd) < 0)
} die_errno("close(%s)", argv[4]);
ret = 0; strbuf_release(&from);
cleanup: strbuf_release(&data);
free(from_buf);
free(data_buf);
free(out_buf); free(out_buf);
return ret; return 0;
} }

3
t/helper/test-truncate.c
View File

@@ -21,5 +21,8 @@ int cmd__truncate(int argc, const char **argv)
if (ftruncate(fd, (off_t) sz) < 0) if (ftruncate(fd, (off_t) sz) < 0)
die_errno("failed to truncate file"); die_errno("failed to truncate file");
close(fd);
return 0; return 0;
} }