From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 16 Feb 2021 19:53:16 +0000 (+0100)
Subject: file_utils: move dup_cloexec() to header
X-Git-Tag: lxc-5.0.0~283^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6347774b4c20e0bc7b840053c148aec247653a8e;p=thirdparty%2Flxc.git

file_utils: move dup_cloexec() to header

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 298e12b5d..625654005 100644
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -564,20 +564,6 @@ int fd_cloexec(int fd, bool cloexec)
 	return 0;
 }
 
-static inline int dup_cloexec(int fd)
-{
-	__do_close int fd_dup = -EBADF;
-
-	fd_dup = dup(fd);
-	if (fd_dup < 0)
-		return -errno;
-
-	if (fd_cloexec(fd_dup, true))
-		return -errno;
-
-	return move_fd(fd_dup);
-}
-
 FILE *fdopen_at(int dfd, const char *path, const char *mode,
 		unsigned int o_flags, unsigned int resolve_flags)
 {
diff --git a/src/lxc/file_utils.h b/src/lxc/file_utils.h
index 36bd9b0c2..af8014e7b 100644
--- a/src/lxc/file_utils.h
+++ b/src/lxc/file_utils.h
@@ -105,4 +105,18 @@ __hidden extern ssize_t lxc_read_try_buf_at(int dfd, const char *path,
  */
 __hidden extern bool same_file_lax(int fda, int fdb);
 
+static inline int dup_cloexec(int fd)
+{
+	__do_close int fd_dup = -EBADF;
+
+	fd_dup = dup(fd);
+	if (fd_dup < 0)
+		return -errno;
+
+	if (fd_cloexec(fd_dup, true))
+		return -errno;
+
+	return move_fd(fd_dup);
+}
+
 #endif /* __LXC_FILE_UTILS_H */