packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libotutil: Make use of dirfd-relative API in ot_gfile_replace_contents_fsync() 

It's just more efficient.
This commit is contained in:
Colin Walters 2014-04-08 18:31:33 -04:00
parent 053dd72649
commit 18aaa49724
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libotutil/ot-gio-utils.c
View File

@ -284,16 +284,23 @@ ot_gfile_replace_contents_fsync (GFile *path,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
int parent_dfd;
int fd; int fd;
const char *target_basename = gs_file_get_basename_cached (path);
gs_unref_object GFile *parent = NULL; gs_unref_object GFile *parent = NULL;
gs_unref_object GFile *tmpfile = NULL; gs_free char *tmpname = NULL;
gs_unref_object GOutputStream *stream = NULL; gs_unref_object GOutputStream *stream = NULL;
gs_unref_object GInputStream *instream = NULL; gs_unref_object GInputStream *instream = NULL;
parent = g_file_get_parent (path); parent = g_file_get_parent (path);
if (!gs_file_open_in_tmpdir (parent, 0644, &tmpfile, &stream, if (!gs_file_open_dir_fd (parent, &parent_dfd,
cancellable, error)) cancellable, error))
goto out;
if (!gs_file_open_in_tmpdir_at (parent_dfd, 0644,
&tmpname, &stream,
cancellable, error))
goto out; goto out;
g_assert (G_IS_FILE_DESCRIPTOR_BASED (stream)); g_assert (G_IS_FILE_DESCRIPTOR_BASED (stream));
@ -320,15 +327,20 @@ ot_gfile_replace_contents_fsync (GFile *path,
if (!g_output_stream_close (stream, cancellable, error)) if (!g_output_stream_close (stream, cancellable, error))
goto out; goto out;
if (!gs_file_rename (tmpfile, path, cancellable, error)) if (renameat (parent_dfd, tmpname, parent_dfd, target_basename) == -1)
goto out; {
ot_util_set_error_from_errno (error, errno);
goto out;
}
g_clear_object (&tmpfile); g_clear_pointer (&tmpname, g_free);
ret = TRUE; ret = TRUE;
out: out:
if (tmpfile) if (tmpname)
(void) gs_file_unlink (tmpfile, NULL, NULL); (void) unlinkat (parent_dfd, tmpname, 0);
if (parent_dfd != -1)
(void) close (parent_dfd);
return ret; return ret;
} }