From 4d46b361ff1371a6f3f4f89ed8ca81ee23e86de8 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 6 Nov 2019 11:54:56 +0100 Subject: Remove raw file descriptors from tar read path Signed-off-by: David Oberhollenzer --- tests/tar_sparse_gnu.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'tests/tar_sparse_gnu.c') diff --git a/tests/tar_sparse_gnu.c b/tests/tar_sparse_gnu.c index 3546571..b67171d 100644 --- a/tests/tar_sparse_gnu.c +++ b/tests/tar_sparse_gnu.c @@ -21,28 +21,28 @@ #define TEST_PATH STRVALUE(TESTPATH) -static int open_read(const char *path) +static FILE *open_read(const char *path) { - int fd = open(path, O_RDONLY); + FILE *fp = fopen(path, "rb"); - if (fd < 0) { + if (fp == NULL) { perror(path); exit(EXIT_FAILURE); } - return fd; + return fp; } int main(void) { tar_header_decoded_t hdr; sparse_map_t *sparse; - int fd; + FILE *fp; assert(chdir(TEST_PATH) == 0); - fd = open_read("sparse-files/gnu-small.tar"); - assert(read_header(fd, &hdr) == 0); + fp = open_read("sparse-files/gnu-small.tar"); + assert(read_header(fp, &hdr) == 0); assert(hdr.sb.st_mode == (S_IFREG | 0644)); assert(hdr.sb.st_uid == 01750); assert(hdr.sb.st_gid == 01750); @@ -70,10 +70,10 @@ int main(void) assert(sparse->next == NULL); clear_header(&hdr); - close(fd); + fclose(fp); - fd = open_read("sparse-files/gnu.tar"); - assert(read_header(fd, &hdr) == 0); + fp = open_read("sparse-files/gnu.tar"); + assert(read_header(fp, &hdr) == 0); assert(hdr.sb.st_mode == (S_IFREG | 0644)); assert(hdr.sb.st_uid == 01750); assert(hdr.sb.st_gid == 01750); @@ -132,7 +132,7 @@ int main(void) assert(sparse == NULL); clear_header(&hdr); - close(fd); + fclose(fp); return EXIT_SUCCESS; } -- cgit v1.2.3