From 80ac731c907c04f60148a696162cb95d7cedc90a Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 1 Oct 2020 10:09:05 -0400 Subject: util: Move redirect() and isopen() to main.c --- util.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index b66dd18..468d664 100644 --- a/util.c +++ b/util.c @@ -92,34 +92,6 @@ error: return NULL; } -bool isopen(int fd) { - return fcntl(fd, F_GETFD) >= 0 || errno != EBADF; -} - -int redirect(int fd, const char *path, int flags, ...) { - mode_t mode = 0; - if (flags & O_CREAT) { - va_list args; - va_start(args, flags); - - // Use int rather than mode_t, because va_arg must receive a - // fully-promoted type - mode = va_arg(args, int); - - va_end(args); - } - - int ret = open(path, flags, mode); - - if (ret >= 0 && ret != fd) { - int orig = ret; - ret = dup2(orig, fd); - close(orig); - } - - return ret; -} - int dup_cloexec(int fd) { #ifdef F_DUPFD_CLOEXEC return fcntl(fd, F_DUPFD_CLOEXEC, 0); -- cgit v1.2.3