file_utils: add fdopenat()

parent 7d9e64d8
...@@ -517,6 +517,91 @@ FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer) ...@@ -517,6 +517,91 @@ FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer)
return f; return f;
} }
int fd_cloexec(int fd, bool cloexec)
{
int oflags, nflags;
oflags = fcntl(fd, F_GETFD, 0);
if (oflags < 0)
return -errno;
if (cloexec)
nflags = oflags | FD_CLOEXEC;
else
nflags = oflags & ~FD_CLOEXEC;
if (nflags == oflags)
return 0;
if (fcntl(fd, F_SETFD, nflags) < 0)
return -errno;
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 *fdopenat(int dfd, const char *path, const char *mode)
{
__do_close int fd = -EBADF;
__do_fclose FILE *f = NULL;
if (is_empty_string(path))
fd = dup_cloexec(dfd);
else
fd = openat(dfd, path, O_CLOEXEC | O_NOCTTY | O_NOFOLLOW);
if (fd < 0)
return NULL;
f = fdopen(fd, "re");
if (!f)
return NULL;
/* Transfer ownership of fd. */
move_fd(fd);
return move_ptr(f);
}
int timens_offset_write(clockid_t clk_id, int64_t s_offset, int64_t ns_offset)
{
__do_close int fd = -EBADF;
int ret;
ssize_t len;
char buf[INTTYPE_TO_STRLEN(int) +
STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) +
STRLITERALLEN(" ") + INTTYPE_TO_STRLEN(int64_t) + 1];
if (clk_id == CLOCK_MONOTONIC_COARSE || clk_id == CLOCK_MONOTONIC_RAW)
clk_id = CLOCK_MONOTONIC;
fd = open("/proc/self/timens_offsets", O_WRONLY | O_CLOEXEC);
if (fd < 0)
return -errno;
len = snprintf(buf, sizeof(buf), "%d %" PRId64 " %" PRId64, clk_id, s_offset, ns_offset);
if (len < 0 || len >= sizeof(buf))
return ret_errno(EFBIG);
ret = lxc_write_nointr(fd, buf, len);
if (ret < 0 || (size_t)ret != len)
return -EIO;
return 0;
}
bool exists_dir_at(int dir_fd, const char *path) bool exists_dir_at(int dir_fd, const char *path)
{ {
struct stat sb; struct stat sb;
......
...@@ -73,8 +73,10 @@ static inline int fd_to_fd(int from, int to) ...@@ -73,8 +73,10 @@ static inline int fd_to_fd(int from, int to)
{ {
return __fd_to_fd(from, to) >= 0; return __fd_to_fd(from, to) >= 0;
} }
__hidden extern int fd_cloexec(int fd, bool cloexec);
__hidden extern int lxc_open_dirfd(const char *dir); __hidden extern int lxc_open_dirfd(const char *dir);
__hidden extern FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer); __hidden extern FILE *fdopen_cached(int fd, const char *mode, void **caller_freed_buffer);
__hidden extern FILE *fdopenat(int dfd, const char *path, const char *mode);
__hidden extern FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffer); __hidden extern FILE *fopen_cached(const char *path, const char *mode, void **caller_freed_buffer);
__hidden extern bool exists_dir_at(int dir_fd, const char *path); __hidden extern bool exists_dir_at(int dir_fd, const char *path);
__hidden extern bool exists_file_at(int dir_fd, const char *path); __hidden extern bool exists_file_at(int dir_fd, const char *path);
......
...@@ -1831,28 +1831,6 @@ int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd) ...@@ -1831,28 +1831,6 @@ int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd)
return 0; return 0;
} }
int fd_cloexec(int fd, bool cloexec)
{
int oflags, nflags;
oflags = fcntl(fd, F_GETFD, 0);
if (oflags < 0)
return -errno;
if (cloexec)
nflags = oflags | FD_CLOEXEC;
else
nflags = oflags & ~FD_CLOEXEC;
if (nflags == oflags)
return 0;
if (fcntl(fd, F_SETFD, nflags) < 0)
return -errno;
return 0;
}
int lxc_rm_rf(const char *dirname) int lxc_rm_rf(const char *dirname)
{ {
__do_closedir DIR *dir = NULL; __do_closedir DIR *dir = NULL;
......
...@@ -223,7 +223,6 @@ __hidden extern uint64_t lxc_find_next_power2(uint64_t n); ...@@ -223,7 +223,6 @@ __hidden extern uint64_t lxc_find_next_power2(uint64_t n);
/* Set a signal the child process will receive after the parent has died. */ /* Set a signal the child process will receive after the parent has died. */
__hidden extern int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd); __hidden extern int lxc_set_death_signal(int signal, pid_t parent, int parent_status_fd);
__hidden extern int fd_cloexec(int fd, bool cloexec);
__hidden extern int lxc_rm_rf(const char *dirname); __hidden extern int lxc_rm_rf(const char *dirname);
__hidden extern bool lxc_can_use_pidfd(int pidfd); __hidden extern bool lxc_can_use_pidfd(int pidfd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment