From 8b1f773461d32939999c50fb1aff256a95d35946 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 22 Mar 2018 14:57:33 -0400 Subject: [PATCH 1/2] lib/deltas: Some misc declare-and-initialize porting Also some `glnx_fstatat_allow_noent()`. Not specifically prep for anything. --- src/libostree/ostree-repo-static-delta-core.c | 131 +++++++----------- 1 file changed, 51 insertions(+), 80 deletions(-) diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c index bca638b21d..4795c2c9d3 100644 --- a/src/libostree/ostree-repo-static-delta-core.c +++ b/src/libostree/ostree-repo-static-delta-core.c @@ -106,11 +106,6 @@ ostree_repo_list_static_delta_names (OstreeRepo *self, while (TRUE) { struct dirent *sub_dent; - const char *name1; - const char *name2; - g_autofree char *superblock_subpath = NULL; - struct stat stbuf; - if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&sub_dfd_iter, &sub_dent, cancellable, error)) return FALSE; @@ -119,39 +114,34 @@ ostree_repo_list_static_delta_names (OstreeRepo *self, if (dent->d_type != DT_DIR) continue; - name1 = dent->d_name; - name2 = sub_dent->d_name; + const char *name1 = dent->d_name; + const char *name2 = sub_dent->d_name; - superblock_subpath = g_strconcat (name2, "/superblock", NULL); - if (fstatat (sub_dfd_iter.fd, superblock_subpath, &stbuf, 0) < 0) - { - if (errno != ENOENT) - { - glnx_set_error_from_errno (error); - return FALSE; - } - } - else - { - g_autofree char *buf = g_strconcat (name1, name2, NULL); - GString *out = g_string_new (""); - char checksum[OSTREE_SHA256_STRING_LEN+1]; - guchar csum[OSTREE_SHA256_DIGEST_LEN]; - const char *dash = strchr (buf, '-'); + g_autofree char *superblock_subpath = g_strconcat (name2, "/superblock", NULL); + if (!glnx_fstatat_allow_noent (sub_dfd_iter.fd, superblock_subpath, NULL, 0, error)) + return FALSE; + + if (errno == 0) + continue; - ostree_checksum_b64_inplace_to_bytes (buf, csum); + g_autofree char *buf = g_strconcat (name1, name2, NULL); + GString *out = g_string_new (""); + char checksum[OSTREE_SHA256_STRING_LEN+1]; + guchar csum[OSTREE_SHA256_DIGEST_LEN]; + const char *dash = strchr (buf, '-'); + + ostree_checksum_b64_inplace_to_bytes (buf, csum); + ostree_checksum_inplace_from_bytes (csum, checksum); + g_string_append (out, checksum); + if (dash) + { + g_string_append_c (out, '-'); + ostree_checksum_b64_inplace_to_bytes (dash+1, csum); ostree_checksum_inplace_from_bytes (csum, checksum); g_string_append (out, checksum); - if (dash) - { - g_string_append_c (out, '-'); - ostree_checksum_b64_inplace_to_bytes (dash+1, csum); - ostree_checksum_inplace_from_bytes (csum, checksum); - g_string_append (out, checksum); - } - - g_ptr_array_add (ret_deltas, g_string_free (out, FALSE)); } + + g_ptr_array_add (ret_deltas, g_string_free (out, FALSE)); } } @@ -322,13 +312,10 @@ ostree_repo_static_delta_execute_offline (OstreeRepo *self, guint32 version; guint64 size; guint64 usize; - const guchar *csum; char checksum[OSTREE_SHA256_STRING_LEN+1]; - gboolean have_all; g_autoptr(GVariant) csum_v = NULL; g_autoptr(GVariant) objects = NULL; g_autoptr(GVariant) part = NULL; - g_autofree char *deltapart_path = NULL; OstreeStaticDeltaOpenFlags delta_open_flags = skip_validation ? OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM : 0; g_autoptr(GVariant) header = g_variant_get_child_value (headers, i); @@ -337,6 +324,7 @@ ostree_repo_static_delta_execute_offline (OstreeRepo *self, if (version > OSTREE_DELTAPART_VERSION) return glnx_throw (error, "Delta part has too new version %u", version); + gboolean have_all; if (!_ostree_repo_static_delta_part_have_all_objects (self, objects, &have_all, cancellable, error)) return FALSE; @@ -347,12 +335,12 @@ ostree_repo_static_delta_execute_offline (OstreeRepo *self, if (have_all) continue; - csum = ostree_checksum_bytes_peek_validate (csum_v, error); + const guchar *csum = ostree_checksum_bytes_peek_validate (csum_v, error); if (!csum) return FALSE; ostree_checksum_inplace_from_bytes (csum, checksum); - deltapart_path = + g_autofree char *deltapart_path = _ostree_get_relative_static_delta_part_path (from_checksum, to_checksum, i); g_autoptr(GInputStream) part_in = NULL; @@ -412,16 +400,14 @@ _ostree_static_delta_part_open (GInputStream *part_in, { const gboolean trusted = (flags & OSTREE_STATIC_DELTA_OPEN_FLAGS_VARIANT_TRUSTED) > 0; const gboolean skip_checksum = (flags & OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM) > 0; - gsize bytes_read; - guint8 comptype; - g_autoptr(GChecksum) checksum = NULL; - g_autoptr(GInputStream) checksum_in = NULL; - GInputStream *source_in; /* We either take a fd or a GBytes reference */ g_return_val_if_fail (G_IS_FILE_DESCRIPTOR_BASED (part_in) || inline_part_bytes != NULL, FALSE); g_return_val_if_fail (skip_checksum || expected_checksum != NULL, FALSE); + g_autoptr(GChecksum) checksum = NULL; + g_autoptr(GInputStream) checksum_in = NULL; + GInputStream *source_in; if (!skip_checksum) { checksum = g_checksum_new (G_CHECKSUM_SHA256); @@ -433,7 +419,9 @@ _ostree_static_delta_part_open (GInputStream *part_in, source_in = part_in; } + guint8 comptype; { guint8 buf[1]; + gsize bytes_read; /* First byte is compression type */ if (!g_input_stream_read_all (source_in, buf, sizeof(buf), &bytes_read, cancellable, error)) @@ -513,7 +501,6 @@ show_one_part (OstreeRepo *self, GCancellable *cancellable, GError **error) { - g_autoptr(GVariant) part = NULL; g_autofree char *part_path = _ostree_get_relative_static_delta_part_path (from, to, i); guint32 version; @@ -532,6 +519,7 @@ show_one_part (OstreeRepo *self, return glnx_throw_errno_prefix (error, "openat(%s)", part_path); g_autoptr(GInputStream) part_in = g_unix_input_stream_new (part_fd, FALSE); + g_autoptr(GVariant) part = NULL; if (!_ostree_static_delta_part_open (part_in, NULL, OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM, NULL, @@ -578,19 +566,13 @@ OstreeDeltaEndianness _ostree_delta_get_endianness (GVariant *superblock, gboolean *out_was_heuristic) { - guint8 endianness_char; - g_autoptr(GVariant) delta_meta = NULL; - g_autoptr(GVariantDict) delta_metadict = NULL; - guint64 total_size = 0; - guint64 total_usize = 0; - guint total_objects = 0; - - delta_meta = g_variant_get_child_value (superblock, 0); - delta_metadict = g_variant_dict_new (delta_meta); + g_autoptr(GVariant) delta_meta = g_variant_get_child_value (superblock, 0); + g_autoptr(GVariantDict) delta_metadict = g_variant_dict_new (delta_meta); if (out_was_heuristic) *out_was_heuristic = FALSE; + guint8 endianness_char; if (g_variant_dict_lookup (delta_metadict, "ostree.endianness", "y", &endianness_char)) { switch (endianness_char) @@ -607,15 +589,16 @@ _ostree_delta_get_endianness (GVariant *superblock, if (out_was_heuristic) *out_was_heuristic = TRUE; + guint64 total_size = 0; + guint64 total_usize = 0; + guint total_objects = 0; { g_autoptr(GVariant) meta_entries = NULL; - guint n_parts; - guint i; gboolean is_byteswapped = FALSE; g_variant_get_child (superblock, 6, "@a" OSTREE_STATIC_DELTA_META_ENTRY_FORMAT, &meta_entries); - n_parts = g_variant_n_children (meta_entries); + const guint n_parts = g_variant_n_children (meta_entries); - for (i = 0; i < n_parts; i++) + for (guint i = 0; i < n_parts; i++) { g_autoptr(GVariant) objects = NULL; guint64 size, usize; @@ -633,7 +616,7 @@ _ostree_delta_get_endianness (GVariant *superblock, double ratio = ((double)size)/((double)usize); /* This should really never happen where compressing things makes it more than 50% bigger. - */ + */ if (ratio > 1.2) { is_byteswapped = TRUE; @@ -726,26 +709,16 @@ _ostree_repo_static_delta_query_exists (OstreeRepo *self, GCancellable *cancellable, GError **error) { - g_autofree char *from = NULL; + g_autofree char *from = NULL; g_autofree char *to = NULL; - struct stat stbuf; - if (!_ostree_parse_delta_name (delta_id, &from, &to, error)) return FALSE; g_autofree char *superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to); + if (!glnx_fstatat_allow_noent (self->repo_dir_fd, superblock_path, NULL, 0, error)) + return FALSE; - if (fstatat (self->repo_dir_fd, superblock_path, &stbuf, 0) < 0) - { - if (errno == ENOENT) - { - *out_exists = FALSE; - return TRUE; - } - else - return glnx_throw_errno_prefix (error, "fstatat(%s)", superblock_path); - } - *out_exists = TRUE; + *out_exists = (errno == 0); return TRUE; } @@ -757,21 +730,15 @@ _ostree_repo_static_delta_dump (OstreeRepo *self, { g_autofree char *from = NULL; g_autofree char *to = NULL; - g_autofree char *superblock_path = NULL; - g_autoptr(GVariant) delta_superblock = NULL; - guint64 total_size = 0, total_usize = 0; - guint64 total_fallback_size = 0, total_fallback_usize = 0; - OstreeDeltaEndianness endianness; - gboolean swap_endian = FALSE; - if (!_ostree_parse_delta_name (delta_id, &from, &to, error)) return FALSE; - superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to); + g_autofree char *superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to); glnx_autofd int superblock_fd = -1; if (!glnx_openat_rdonly (self->repo_dir_fd, superblock_path, TRUE, &superblock_fd, error)) return FALSE; + g_autoptr(GVariant) delta_superblock = NULL; if (!ot_variant_read_fd (superblock_fd, 0, (GVariantType*)OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT, TRUE, &delta_superblock, error)) @@ -779,6 +746,8 @@ _ostree_repo_static_delta_dump (OstreeRepo *self, g_print ("Delta: %s\n", delta_id); + gboolean swap_endian = FALSE; + OstreeDeltaEndianness endianness; { const char *endianness_description; gboolean was_heuristic; @@ -825,6 +794,8 @@ _ostree_repo_static_delta_dump (OstreeRepo *self, g_print ("Number of fallback entries: %u\n", n_fallback); + guint64 total_size = 0, total_usize = 0; + guint64 total_fallback_size = 0, total_fallback_usize = 0; for (guint i = 0; i < n_fallback; i++) { guint64 size, usize; From 1c536525ba792296912a3ee8b8df6fab32ab44e9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 23 Mar 2018 10:30:30 -0400 Subject: [PATCH 2/2] fixup! lib/deltas: Some misc declare-and-initialize porting --- src/libostree/ostree-repo-static-delta-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c index 4795c2c9d3..10294c63f2 100644 --- a/src/libostree/ostree-repo-static-delta-core.c +++ b/src/libostree/ostree-repo-static-delta-core.c @@ -120,8 +120,7 @@ ostree_repo_list_static_delta_names (OstreeRepo *self, g_autofree char *superblock_subpath = g_strconcat (name2, "/superblock", NULL); if (!glnx_fstatat_allow_noent (sub_dfd_iter.fd, superblock_subpath, NULL, 0, error)) return FALSE; - - if (errno == 0) + if (errno == ENOENT) continue; g_autofree char *buf = g_strconcat (name1, name2, NULL);