[ostree/wip/gs-dir-iter: 17/17] core: Add some helper functions to read all input from a fd
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree/wip/gs-dir-iter: 17/17] core: Add some helper functions to read all input from a fd
- Date: Mon, 22 Dec 2014 21:33:25 +0000 (UTC)
commit f14172639e57fa9261e622a7f5b0a293f8205b60
Author: Colin Walters <walters verbum org>
Date: Mon Dec 15 22:23:37 2014 -0500
core: Add some helper functions to read all input from a fd
Sadly...but can't quite go in GIO due to the Unix fd dependency.
src/libostree/ostree-repo-commit.c | 233 ++++++++++++++++++++++++++++++++----
src/libostree/ostree-repo.c | 16 +--
src/libotutil/ot-fs-utils.c | 28 +++++
src/libotutil/ot-fs-utils.h | 6 +
src/libotutil/ot-gio-utils.c | 37 ++++++
src/libotutil/ot-gio-utils.h | 4 +
6 files changed, 288 insertions(+), 36 deletions(-)
---
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 6161f2b..7745343 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -24,6 +24,7 @@
#include <glib-unix.h>
#include <gio/gfiledescriptorbased.h>
+#include <gio/gunixinputstream.h>
#include "otutil.h"
#include "libgsystem.h"
@@ -1901,6 +1902,8 @@ get_modified_xattrs (OstreeRepo *self,
const char *relpath,
GFileInfo *file_info,
GFile *path,
+ int dfd,
+ const char *dfd_subpath,
GVariant **out_xattrs,
GCancellable *cancellable,
GError **error)
@@ -1915,8 +1918,25 @@ get_modified_xattrs (OstreeRepo *self,
}
else if (!(modifier && (modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS) > 0))
{
- if (!gs_file_get_all_xattrs (path, &ret_xattrs, cancellable, error))
- goto out;
+ if (path)
+ {
+ if (!gs_file_get_all_xattrs (path, &ret_xattrs, cancellable, error))
+ goto out;
+ }
+ else if (dfd_subpath == NULL)
+ {
+ g_assert (dfd != -1);
+ if (!gs_fd_get_all_xattrs (dfd, &ret_xattrs,
+ cancellable, error))
+ goto out;
+ }
+ else
+ {
+ g_assert (dfd != -1);
+ if (!gs_dfd_and_name_get_all_xattrs (dfd, dfd_subpath, &ret_xattrs,
+ cancellable, error))
+ goto out;
+ }
}
if (modifier && modifier->sepolicy)
@@ -1964,11 +1984,20 @@ write_directory_to_mtree_internal (OstreeRepo *self,
GPtrArray *path,
GCancellable *cancellable,
GError **error);
+static gboolean
+write_dfd_iter_to_mtree_internal (OstreeRepo *self,
+ GSDirFdIterator *src_dfd_iter,
+ OstreeMutableTree *mtree,
+ OstreeRepoCommitModifier *modifier,
+ GPtrArray *path,
+ GCancellable *cancellable,
+ GError **error);
static gboolean
write_directory_content_to_mtree_internal (OstreeRepo *self,
OstreeRepoFile *repo_dir,
GFileEnumerator *dir_enum,
+ GSDirFdIterator *dfd_iter,
GFileInfo *child_info,
OstreeMutableTree *mtree,
OstreeRepoCommitModifier *modifier,
@@ -1985,13 +2014,22 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
GFileType file_type;
OstreeRepoCommitFilterResult filter_result;
+ g_assert (dir_enum != NULL || dfd_iter != NULL);
+
name = g_file_info_get_name (child_info);
g_ptr_array_add (path, (char*)name);
if (modifier != NULL)
- child_relpath = ptrarray_path_join (path);
+ {
+ child_relpath = ptrarray_path_join (path);
- filter_result = apply_commit_filter (self, modifier, child_relpath, child_info, &modified_info);
+ filter_result = apply_commit_filter (self, modifier, child_relpath, child_info, &modified_info);
+ }
+ else
+ {
+ filter_result = OSTREE_REPO_COMMIT_FILTER_ALLOW;
+ modified_info = g_object_ref (child_info);
+ }
if (filter_result != OSTREE_REPO_COMMIT_FILTER_ALLOW)
{
@@ -2000,8 +2038,6 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
goto out;
}
- child = g_file_enumerator_get_child (dir_enum, child_info);
-
file_type = g_file_info_get_file_type (child_info);
switch (file_type)
{
@@ -2016,18 +2052,36 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
goto out;
}
+ if (dir_enum != NULL)
+ child = g_file_enumerator_get_child (dir_enum, child_info);
+
if (file_type == G_FILE_TYPE_DIRECTORY)
{
if (!ostree_mutable_tree_ensure_dir (mtree, name, &child_mtree, error))
goto out;
- if (!write_directory_to_mtree_internal (self, child, child_mtree,
- modifier, path,
- cancellable, error))
- goto out;
+ if (dir_enum != NULL)
+ {
+ if (!write_directory_to_mtree_internal (self, child, child_mtree,
+ modifier, path,
+ cancellable, error))
+ goto out;
+ }
+ else
+ {
+ GSDirFdIterator child_dfd_iter = { 0, };
+
+ if (!gs_dirfd_iterator_init_at (dfd_iter->fd, name, FALSE, &child_dfd_iter, error))
+ goto out;
+
+ if (!write_dfd_iter_to_mtree_internal (self, &child_dfd_iter, mtree, modifier, path,
+ cancellable, error))
+ goto out;
+ }
}
else if (repo_dir)
{
+ g_assert (dir_enum != NULL);
g_debug ("Adding: %s", gs_file_get_path_cached (child));
if (!ostree_mutable_tree_replace_file (mtree, name,
ostree_repo_file_get_checksum ((OstreeRepoFile*) child),
@@ -2044,7 +2098,6 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
gs_free guchar *child_file_csum = NULL;
gs_free char *tmp_checksum = NULL;
- g_debug ("Adding: %s", gs_file_get_path_cached (child));
loose_checksum = devino_cache_lookup (self, child_info);
if (loose_checksum)
@@ -2057,13 +2110,26 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
{
if (g_file_info_get_file_type (modified_info) == G_FILE_TYPE_REGULAR)
{
- file_input = (GInputStream*)g_file_read (child, cancellable, error);
- if (!file_input)
- goto out;
+ if (child != NULL)
+ {
+ file_input = (GInputStream*)g_file_read (child, cancellable, error);
+ if (!file_input)
+ goto out;
+ }
+ else
+ {
+ int filefd = openat (dfd_iter->fd, name, O_RDONLY, 0);
+ if (filefd == -1)
+ {
+ ot_util_set_error_from_errno (error, errno);
+ goto out;
+ }
+ file_input = (GInputStream*)g_unix_input_stream_new (filefd, TRUE);
+ }
}
if (!get_modified_xattrs (self, modifier,
- child_relpath, child_info, child,
+ child_relpath, child_info, child, dfd_iter->fd, name,
&xattrs,
cancellable, error))
goto out;
@@ -2107,11 +2173,12 @@ write_directory_to_mtree_internal (OstreeRepo *self,
gs_unref_object GFileEnumerator *dir_enum = NULL;
gs_unref_object GFileInfo *child_info = NULL;
- g_debug ("Examining: %s", gs_file_get_path_cached (dir));
+ if (dir)
+ g_debug ("Examining: %s", gs_file_get_path_cached (dir));
/* If the directory is already in the repository, we can try to
* reuse checksums to skip checksumming. */
- if (OSTREE_IS_REPO_FILE (dir) && modifier == NULL)
+ if (dir && OSTREE_IS_REPO_FILE (dir) && modifier == NULL)
repo_dir = (OstreeRepoFile *) dir;
if (repo_dir)
@@ -2154,8 +2221,8 @@ write_directory_to_mtree_internal (OstreeRepo *self,
if (filter_result == OSTREE_REPO_COMMIT_FILTER_ALLOW)
{
- g_debug ("Adding: %s", gs_file_get_path_cached (dir));
- if (!get_modified_xattrs (self, modifier, relpath, child_info, dir,
+ if (!get_modified_xattrs (self, modifier, relpath, child_info,
+ dir, -1, NULL,
&xattrs,
cancellable, error))
goto out;
@@ -2193,7 +2260,8 @@ write_directory_to_mtree_internal (OstreeRepo *self,
if (child_info == NULL)
break;
- if (!write_directory_content_to_mtree_internal (self, repo_dir, dir_enum, child_info,
+ if (!write_directory_content_to_mtree_internal (self, repo_dir, dir_enum, NULL,
+ child_info,
mtree, modifier, path,
cancellable, error))
goto out;
@@ -2205,6 +2273,110 @@ write_directory_to_mtree_internal (OstreeRepo *self,
return ret;
}
+static gboolean
+write_dfd_iter_to_mtree_internal (OstreeRepo *self,
+ GSDirFdIterator *src_dfd_iter,
+ OstreeMutableTree *mtree,
+ OstreeRepoCommitModifier *modifier,
+ GPtrArray *path,
+ GCancellable *cancellable,
+ GError **error)
+{
+ gboolean ret = FALSE;
+ gs_unref_object GFileInfo *child_info = NULL;
+ gs_unref_object GFileInfo *modified_info = NULL;
+ gs_unref_variant GVariant *xattrs = NULL;
+ gs_free guchar *child_file_csum = NULL;
+ gs_free char *tmp_checksum = NULL;
+ gs_free char *relpath = NULL;
+ OstreeRepoCommitFilterResult filter_result;
+ struct stat dir_stbuf;
+
+ if (fstat (src_dfd_iter->fd, &dir_stbuf) != 0)
+ {
+ ot_util_set_error_from_errno (error, errno);
+ goto out;
+ }
+
+ child_info = _ostree_header_gfile_info_new (dir_stbuf.st_mode, dir_stbuf.st_uid, dir_stbuf.st_gid);
+
+ if (modifier != NULL)
+ {
+ relpath = ptrarray_path_join (path);
+
+ filter_result = apply_commit_filter (self, modifier, relpath, child_info, &modified_info);
+ }
+ else
+ {
+ filter_result = OSTREE_REPO_COMMIT_FILTER_ALLOW;
+ modified_info = g_object_ref (child_info);
+ }
+
+ if (filter_result == OSTREE_REPO_COMMIT_FILTER_ALLOW)
+ {
+ if (!get_modified_xattrs (self, modifier, relpath, modified_info,
+ NULL, src_dfd_iter->fd, NULL,
+ &xattrs,
+ cancellable, error))
+ goto out;
+
+ if (!_ostree_repo_write_directory_meta (self, modified_info, xattrs, &child_file_csum,
+ cancellable, error))
+ goto out;
+
+ g_free (tmp_checksum);
+ tmp_checksum = ostree_checksum_from_bytes (child_file_csum);
+ ostree_mutable_tree_set_metadata_checksum (mtree, tmp_checksum);
+ }
+
+ if (filter_result != OSTREE_REPO_COMMIT_FILTER_ALLOW)
+ {
+ ret = TRUE;
+ goto out;
+ }
+
+ while (TRUE)
+ {
+ struct dirent *dent;
+ struct stat stbuf;
+ gs_unref_object GFileInfo *child_info = NULL;
+
+ if (!gs_dirfd_iterator_next_dent (src_dfd_iter, &dent, cancellable, error))
+ goto out;
+
+ if (dent == NULL)
+ break;
+
+ if (fstatat (src_dfd_iter->fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) == -1)
+ {
+ ot_util_set_error_from_errno (error, errno);
+ goto out;
+ }
+
+ child_info = _ostree_header_gfile_info_new (stbuf.st_mode, stbuf.st_uid, stbuf.st_gid);
+ g_file_info_set_name (child_info, dent->d_name);
+
+ if (S_ISLNK (stbuf.st_mode))
+ {
+ if (!ot_readlinkat_gfile_info (src_dfd_iter->fd, dent->d_name,
+ child_info, cancellable, error))
+ goto out;
+ }
+
+ if (!write_directory_content_to_mtree_internal (self, NULL, NULL, src_dfd_iter,
+ child_info,
+ mtree, modifier, path,
+ cancellable, error))
+ goto out;
+
+ g_clear_object (&child_info);
+ }
+
+ ret = TRUE;
+ out:
+ return ret;
+}
+
/**
* ostree_repo_write_directory_to_mtree:
* @self: Repo
@@ -2234,9 +2406,24 @@ ostree_repo_write_directory_to_mtree (OstreeRepo *self,
}
path = g_ptr_array_new ();
- if (!write_directory_to_mtree_internal (self, dir, mtree, modifier, path,
- cancellable, error))
- goto out;
+ if (g_file_is_native (dir))
+ {
+ GSDirFdIterator dfd_iter = { 0, };
+
+ if (!gs_dirfd_iterator_init_at (AT_FDCWD, gs_file_get_path_cached (dir), FALSE,
+ &dfd_iter, error))
+ goto out;
+
+ if (!write_dfd_iter_to_mtree_internal (self, &dfd_iter, mtree, modifier, path,
+ cancellable, error))
+ goto out;
+ }
+ else
+ {
+ if (!write_directory_to_mtree_internal (self, dir, mtree, modifier, path,
+ cancellable, error))
+ goto out;
+ }
ret = TRUE;
out:
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index d60dc41..7ed2ecc 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1810,19 +1810,9 @@ query_info_for_bare_content_object (OstreeRepo *self,
}
else if (S_ISLNK (stbuf.st_mode))
{
- char targetbuf[PATH_MAX+1];
- ssize_t len;
-
- do
- len = readlinkat (self->objects_dir_fd, loose_path_buf, targetbuf, sizeof (targetbuf) - 1);
- while (G_UNLIKELY (len == -1 && errno == EINTR));
- if (len == -1)
- {
- ot_util_set_error_from_errno (error, errno);
- goto out;
- }
- targetbuf[len] = '\0';
- g_file_info_set_symlink_target (ret_info, targetbuf);
+ if (!ot_readlinkat_gfile_info (self->objects_dir_fd, loose_path_buf,
+ ret_info, cancellable, error))
+ goto out;
}
else
{
diff --git a/src/libotutil/ot-fs-utils.c b/src/libotutil/ot-fs-utils.c
index 966f31a..38df1f3 100644
--- a/src/libotutil/ot-fs-utils.c
+++ b/src/libotutil/ot-fs-utils.c
@@ -115,3 +115,31 @@ ot_lsetxattrat (int dfd,
return TRUE;
}
+
+gboolean
+ot_readlinkat_gfile_info (int dfd,
+ const char *path,
+ GFileInfo *target_info,
+ GCancellable *cancellable,
+ GError **error)
+{
+ gboolean ret = FALSE;
+ char targetbuf[PATH_MAX+1];
+ ssize_t len;
+
+ do
+ len = readlinkat (dfd, path, targetbuf, sizeof (targetbuf) - 1);
+ while (G_UNLIKELY (len == -1 && errno == EINTR));
+ if (len == -1)
+ {
+ ot_util_set_error_from_errno (error, errno);
+ goto out;
+ }
+ targetbuf[len] = '\0';
+ g_file_info_set_symlink_target (target_info, targetbuf);
+
+ ret = TRUE;
+ out:
+ return ret;
+}
+
diff --git a/src/libotutil/ot-fs-utils.h b/src/libotutil/ot-fs-utils.h
index 6d4a372..e0bb400 100644
--- a/src/libotutil/ot-fs-utils.h
+++ b/src/libotutil/ot-fs-utils.h
@@ -44,5 +44,11 @@ gboolean ot_lsetxattrat (int dfd,
int flags,
GError **error);
+gboolean ot_readlinkat_gfile_info (int dfd,
+ const char *path,
+ GFileInfo *target_info,
+ GCancellable *cancellable,
+ GError **error);
+
G_END_DECLS
diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index dff2113..99feb7a 100644
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -538,3 +538,40 @@ ot_gfile_atomic_symlink_swap (GFile *path,
if (parent_dfd != -1) (void) close (parent_dfd);
return ret;
}
+
+GBytes *
+ot_util_fd_readall_bytes (int fd, GCancellable *cancellable, GError **error)
+{
+ gs_unref_object GUnixInputStream *unixin = (GUnixInputStream*)g_unix_input_stream_new (fd, FALSE);
+ gs_unref_object GMemoryOutputStream *memout = (GMemoryOutputStream*)g_memory_output_stream_new_resizable
();
+
+ if (g_output_stream_splice ((GOutputStream*)memout, (GInputStream*)unixin, 0, cancellable, error) < 0)
+ return NULL;
+
+ return g_memory_output_stream_steal_as_bytes (memout);
+}
+
+char *
+ot_util_fd_readall_utf8 (int fd, GCancellable *cancellable, GError **error)
+{
+ GBytes *ret = ot_util_fd_readall_bytes (fd, cancellable, error);
+ const char *buf;
+ gsize len;
+
+ if (!ret)
+ return NULL;
+
+ buf = g_bytes_get_data (ret, &len);
+
+ if (!g_utf8_validate (buf, len, NULL))
+ {
+ g_bytes_unref (ret);
+ g_set_error (error,
+ G_IO_ERROR,
+ G_IO_ERROR_INVALID_DATA,
+ "Invalid UTF-8");
+ return NULL;
+ }
+
+ return g_bytes_unref_to_data (ret, &len);
+}
diff --git a/src/libotutil/ot-gio-utils.h b/src/libotutil/ot-gio-utils.h
index b3cb1f8..b41b802 100644
--- a/src/libotutil/ot-gio-utils.h
+++ b/src/libotutil/ot-gio-utils.h
@@ -91,5 +91,9 @@ gboolean ot_util_fsync_directory (GFile *dir,
GCancellable *cancellable,
GError **error);
+GBytes *ot_util_fd_readall_bytes (int fd, GCancellable *cancellable, GError **error);
+
+char * ot_util_fd_readall_utf8 (int fd, GCancellable *cancellable, GError **error);
+
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
