diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-06 11:54:56 +0100 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-06 11:56:02 +0100 |
commit | 4d46b361ff1371a6f3f4f89ed8ca81ee23e86de8 (patch) | |
tree | 0705d7c216ea345665cd38345bc21f8931195849 /tests/tar_xattr_schily.c | |
parent | 3afffc2a59cfc3888a84b2b2305b5312393ff4e8 (diff) |
Remove raw file descriptors from tar read path
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests/tar_xattr_schily.c')
-rw-r--r-- | tests/tar_xattr_schily.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/tar_xattr_schily.c b/tests/tar_xattr_schily.c index e543351..7434a41 100644 --- a/tests/tar_xattr_schily.c +++ b/tests/tar_xattr_schily.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; char buffer[6]; - int fd; + FILE *fp; assert(chdir(TEST_PATH) == 0); - fd = open_read("xattr/xattr-schily.tar"); - assert(read_header(fd, &hdr) == 0); + fp = open_read("xattr/xattr-schily.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); @@ -51,7 +51,7 @@ int main(void) assert(hdr.mtime == 1543094477); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); - assert(read_retry("data0", fd, buffer, 5) == 0); + assert(read_retry("data0", fp, buffer, 5) == 0); buffer[5] = '\0'; assert(strcmp(buffer, "test\n") == 0); @@ -61,6 +61,6 @@ int main(void) assert(hdr.xattr->next == NULL); clear_header(&hdr); - close(fd); + fclose(fp); return EXIT_SUCCESS; } |