From 9b4f14cd45541ed0696738aec197d3a3a094915d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 11 Jan 2018 09:36:00 +0100 Subject: [PATCH] Add flatpak_file_rename Closes: #98 Approved by: alexlarsson --- src/builder-flatpak-utils.c | 17 +++++++++++++++++ src/builder-flatpak-utils.h | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/src/builder-flatpak-utils.c b/src/builder-flatpak-utils.c index f62c80ef..d2c47b0d 100644 --- a/src/builder-flatpak-utils.c +++ b/src/builder-flatpak-utils.c @@ -897,6 +897,23 @@ flatpak_rm_rf (GFile *dir, cancellable, error); } +gboolean flatpak_file_rename (GFile *from, + GFile *to, + GCancellable *cancellable, + GError **error) +{ + if (g_cancellable_set_error_if_cancelled (cancellable, error)) + return FALSE; + + if (rename (flatpak_file_get_path_cached (from), + flatpak_file_get_path_cached (to)) < 0) + { + glnx_set_error_from_errno (error); + return FALSE; + } + + return TRUE; +} #define OSTREE_GIO_FAST_QUERYINFO ("standard::name,standard::type,standard::size,standard::is-symlink,standard::symlink-target," \ "unix::device,unix::inode,unix::mode,unix::uid,unix::gid,unix::rdev") diff --git a/src/builder-flatpak-utils.h b/src/builder-flatpak-utils.h index bf7f37ad..65323988 100644 --- a/src/builder-flatpak-utils.h +++ b/src/builder-flatpak-utils.h @@ -221,6 +221,11 @@ GFile *flatpak_build_file_va (GFile *base, va_list args); GFile *flatpak_build_file (GFile *base, ...) G_GNUC_NULL_TERMINATED; +gboolean flatpak_file_rename (GFile *from, + GFile *to, + GCancellable *cancellable, + GError **error); + gboolean flatpak_openat_noatime (int dfd, const char *name, int *ret_fd,