From 3a975bd37b82a6e66a2cd5977544b03a6b24ce70 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sun, 9 Dec 2018 14:04:58 +0000 Subject: win32: use open_read_close() where possible --- win32/mingw.c | 8 ++------ win32/process.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/win32/mingw.c b/win32/mingw.c index da77dee36..10169266d 100644 --- a/win32/mingw.c +++ b/win32/mingw.c @@ -327,7 +327,7 @@ static inline int get_file_attr(const char *fname, WIN32_FILE_ATTRIBUTE_DATA *fd */ static int has_exec_format(const char *name) { - int fd, n, sig; + int n, sig; unsigned int offset; unsigned char buf[1024]; @@ -336,11 +336,7 @@ static int has_exec_format(const char *name) if (n > 4 && !strcasecmp(name+n-4, ".dll")) return 0; - fd = open(name, O_RDONLY); - if (fd < 0) - return 0; - n = read(fd, buf, sizeof(buf)-1); - close(fd); + n = open_read_close(name, buf, sizeof(buf)); if (n < 4) /* at least '#!/x' and not error */ return 0; diff --git a/win32/process.c b/win32/process.c index f059bee18..20e73baee 100644 --- a/win32/process.c +++ b/win32/process.c @@ -55,13 +55,9 @@ static int parse_interpreter(const char *cmd, interp_t *interp) { char *path, *t; - int n, fd; + int n; - fd = open(cmd, O_RDONLY); - if (fd < 0) - return 0; - n = read(fd, interp->buf, sizeof(interp->buf)-1); - close(fd); + n = open_read_close(cmd, interp->buf, sizeof(interp->buf)-1); if (n < 4) /* at least '#!/x' and not error */ return 0; -- cgit v1.2.3-55-g6feb