-Subproject commit e30154431d7eea6397e5502b175ba3b50330140f
+Subproject commit 5362f6bc3ff3e30f379e767b203d15c9e56d6f08
}
/* Now let's fdatasync() for the new file */
- { glnx_fd_close int new_config_fd = -1;
+ { glnx_autofd int new_config_fd = -1;
if (!glnx_openat_rdonly (AT_FDCWD, gs_file_get_path_cached (new_config_path), TRUE, &new_config_fd, error))
return FALSE;
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int uenv_fd = -1;
+ glnx_autofd int uenv_fd = -1;
__attribute__((cleanup(_ostree_kernel_args_cleanup))) OstreeKernelArgs *kargs = NULL;
const char *uenv_path = NULL;
const char *ostree_arg = NULL;
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!glnx_openat_rdonly (parent_dfd, path, TRUE, &fd, error))
return FALSE;
for (guint i = 0; i < self->key_ascii_files->len; i++)
{
const char *path = self->key_ascii_files->pdata[i];
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
g_auto(gpgme_data_t) kdata = NULL;
if (!glnx_openat_rdonly (AT_FDCWD, path, TRUE, &fd, error))
if (g_str_equal (name, "secring.gpg"))
continue;
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!glnx_openat_rdonly (dfd_iter.fd, dent->d_name, TRUE, &fd, error))
return FALSE;
/* Prepare to write to the output unit dir; we use the "normal" dir
* that overrides /usr, but not /etc.
*/
- glnx_fd_close int normal_dir_dfd = -1;
+ glnx_autofd int normal_dir_dfd = -1;
if (!glnx_opendirat (AT_FDCWD, normal_dir, TRUE, &normal_dir_dfd, error))
return FALSE;
}
}
- glnx_fd_close int destination_dfd = -1;
+ glnx_autofd int destination_dfd = -1;
if (!glnx_opendirat (destination_parent_fd, destination_name, TRUE,
&destination_dfd, error))
return FALSE;
* exists.
*/
int destination_dfd = destination_parent_fd;
- glnx_fd_close int destination_dfd_owned = -1;
+ glnx_autofd int destination_dfd_owned = -1;
if (strcmp (destination_name, ".") != 0)
{
if (mkdirat (destination_parent_fd, destination_name, 0700) < 0
/* Ensure that in the case of a power cut all the directory metadata that
we want has reached the disk. In particular, we want this before we
update the refs to point to these objects. */
- glnx_fd_close int target_dir_fd = -1;
+ glnx_autofd int target_dir_fd = -1;
loose_objpath[2] = 0;
if (self->commit_stagedir.initialized)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!ot_openat_ignore_enoent (self->commit_stagedir.fd, buf, &fd, error))
return FALSE;
if (fd != -1)
out_metadata, error);
}
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!ot_openat_ignore_enoent (self->objects_dir_fd, buf, &fd, error))
return FALSE;
if (fd != -1)
* that basically just optionally does chown(). Perhaps
* in the future we should add flags for those things?
*/
- glnx_fd_close int src_fd = -1;
+ glnx_autofd int src_fd = -1;
if (!glnx_openat_rdonly (src_repo->objects_dir_fd, loose_path_buf,
FALSE, &src_fd, error))
return FALSE;
g_autofree gchar *mount_name = NULL;
g_autoptr(GFile) mount_root = NULL;
g_autofree gchar *mount_root_path = NULL;
- glnx_fd_close int mount_root_dfd = -1;
+ glnx_autofd int mount_root_dfd = -1;
struct stat mount_root_stbuf;
- glnx_fd_close int repos_dfd = -1;
+ glnx_autofd int repos_dfd = -1;
gsize i;
g_autoptr(GHashTable) repo_to_refs = NULL; /* (element-type UriAndKeyring GHashTable) */
GHashTable *supported_ref_to_checksum; /* (element-type OstreeCollectionRef utf8) */
GError **error)
{
g_autofree char *commitpartial_path = _ostree_get_commitpartial_path (checksum);
- glnx_fd_close int fd = openat (pull_data->repo->repo_dir_fd, commitpartial_path, O_EXCL | O_CREAT | O_WRONLY | O_CLOEXEC | O_NOCTTY, 0644);
+ glnx_autofd int fd = openat (pull_data->repo->repo_dir_fd, commitpartial_path, O_EXCL | O_CREAT | O_WRONLY | O_CLOEXEC | O_NOCTTY, 0644);
if (fd == -1)
{
if (errno != EEXIST)
return TRUE;
const char *summary_cache_sig_file = glnx_strjoina (_OSTREE_SUMMARY_CACHE_DIR, "/", remote, ".sig");
- glnx_fd_close int prev_fd = -1;
+ glnx_autofd int prev_fd = -1;
if (!ot_openat_ignore_enoent (self->cache_dir_fd, summary_cache_sig_file, &prev_fd, error))
return FALSE;
if (prev_fd < 0)
if (g_bytes_compare (old_sig_contents, summary_sig) == 0)
{
const char *summary_cache_file = glnx_strjoina (_OSTREE_SUMMARY_CACHE_DIR, "/", remote);
- glnx_fd_close int summary_fd = -1;
+ glnx_autofd int summary_fd = -1;
GBytes *summary_data;
GError **error)
{
g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
- glnx_fd_close int ret_fd = -1;
+ glnx_autofd int ret_fd = -1;
if (!glnx_dirfd_iterator_init_at (self->repo_dir_fd, "refs/remotes", TRUE, &dfd_iter, error))
return FALSE;
while (TRUE)
{
struct dirent *dent = NULL;
- glnx_fd_close int remote_dfd = -1;
+ glnx_autofd int remote_dfd = -1;
if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&dfd_iter, &dent, NULL, error))
return FALSE;
{
__attribute__((unused)) GCancellable *cancellable = NULL;
g_autofree char *ret_rev = NULL;
- glnx_fd_close int target_fd = -1;
+ glnx_autofd int target_fd = -1;
g_return_val_if_fail (ref != NULL, FALSE);
{
if (S_ISDIR (stbuf.st_mode))
{
- glnx_fd_close int base_fd = -1;
+ glnx_autofd int base_fd = -1;
g_autoptr(GString) base_path = g_string_new ("");
if (!cut_prefix)
g_string_printf (base_path, "%s/", ref_prefix);
}
else
{
- glnx_fd_close int prefix_dfd = -1;
+ glnx_autofd int prefix_dfd = -1;
if (!glnx_opendirat (self->repo_dir_fd, prefix_path, TRUE, &prefix_dfd, error))
return FALSE;
{
g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
g_autoptr(GString) base_path = g_string_new ("");
- glnx_fd_close int refs_heads_dfd = -1;
+ glnx_autofd int refs_heads_dfd = -1;
if (!glnx_opendirat (self->repo_dir_fd, "refs/heads", TRUE, &refs_heads_dfd, error))
return FALSE;
while (TRUE)
{
struct dirent *dent;
- glnx_fd_close int remote_dfd = -1;
+ glnx_autofd int remote_dfd = -1;
if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&dfd_iter, &dent, cancellable, error))
return FALSE;
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int dfd = -1;
+ glnx_autofd int dfd = -1;
g_return_val_if_fail (remote == NULL || ref->collection_id == NULL, FALSE);
g_return_val_if_fail (!(rev != NULL && alias != NULL), FALSE);
}
else if (remote == NULL && ref->collection_id != NULL)
{
- glnx_fd_close int refs_mirrors_dfd = -1;
+ glnx_autofd int refs_mirrors_dfd = -1;
/* refs/mirrors might not exist in older repositories, so create it. */
if (!glnx_shutil_mkdir_p_at_open (self->repo_dir_fd, "refs/mirrors", 0777,
}
else
{
- glnx_fd_close int refs_remotes_dfd = -1;
+ glnx_autofd int refs_remotes_dfd = -1;
if (!glnx_opendirat (self->repo_dir_fd, "refs/remotes", TRUE,
&refs_remotes_dfd, error))
if (main_collection_id != NULL &&
(match_collection_id == NULL || g_strcmp0 (match_collection_id, main_collection_id) == 0))
{
- glnx_fd_close int refs_heads_dfd = -1;
+ glnx_autofd int refs_heads_dfd = -1;
if (!glnx_opendirat (self->repo_dir_fd, "refs/heads", TRUE, &refs_heads_dfd, error))
return FALSE;
while (refs_dir_exists)
{
struct dirent *dent;
- glnx_fd_close int subdir_fd = -1;
+ glnx_autofd int subdir_fd = -1;
const gchar *current_collection_id;
g_autofree gchar *remote_collection_id = NULL;
g_autoptr(GVariant) to_commit = NULL;
const char *opt_filename;
g_autofree char *descriptor_name = NULL;
- glnx_fd_close int descriptor_dfd = -1;
+ glnx_autofd int descriptor_dfd = -1;
g_autoptr(GVariant) fallback_headers = NULL;
g_autoptr(GVariant) detached = NULL;
gboolean inline_parts;
guint endianness = G_BYTE_ORDER;
- glnx_fd_close int tmp_dfd = -1;
+ glnx_autofd int tmp_dfd = -1;
builder.parts = g_ptr_array_new_with_free_func ((GDestroyNotify)ostree_static_delta_part_builder_unref);
builder.fallback_objects = g_ptr_array_new_with_free_func ((GDestroyNotify)g_variant_unref);
const char *dir_or_file_path = gs_file_get_path_cached (dir_or_file);
/* First, try opening it as a directory */
- glnx_fd_close int dfd = glnx_opendirat_with_errno (AT_FDCWD, dir_or_file_path, TRUE);
+ glnx_autofd int dfd = glnx_opendirat_with_errno (AT_FDCWD, dir_or_file_path, TRUE);
if (dfd < 0)
{
if (errno != ENOTDIR)
else
basename = g_strdup ("superblock");
- glnx_fd_close int meta_fd = openat (dfd, basename, O_RDONLY | O_CLOEXEC);
+ glnx_autofd int meta_fd = openat (dfd, basename, O_RDONLY | O_CLOEXEC);
if (meta_fd < 0)
return glnx_throw_errno_prefix (error, "openat(%s)", basename);
else
{
g_autofree char *relpath = g_strdup_printf ("%u", i); /* TODO avoid malloc here */
- glnx_fd_close int part_fd = openat (dfd, relpath, O_RDONLY | O_CLOEXEC);
+ glnx_autofd int part_fd = openat (dfd, relpath, O_RDONLY | O_CLOEXEC);
if (part_fd < 0)
return glnx_throw_errno_prefix (error, "Opening deltapart '%s'", relpath);
g_print ("PartMeta%u: nobjects=%u size=%" G_GUINT64_FORMAT " usize=%" G_GUINT64_FORMAT "\n",
i, (guint)(g_variant_get_size (objects) / OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN), size, usize);
- glnx_fd_close gint part_fd = openat (self->repo_dir_fd, part_path, O_RDONLY | O_CLOEXEC);
+ glnx_autofd int part_fd = openat (self->repo_dir_fd, part_path, O_RDONLY | O_CLOEXEC);
if (part_fd < 0)
return glnx_throw_errno_prefix (error, "openat(%s)", part_path);
g_autoptr(GInputStream) part_in = g_unix_input_stream_new (part_fd, FALSE);
superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to);
- glnx_fd_close int superblock_fd = -1;
+ glnx_autofd int superblock_fd = -1;
if (!glnx_openat_rdonly (self->repo_dir_fd, superblock_path, TRUE, &superblock_fd, error))
return FALSE;
if (!ot_variant_read_fd (superblock_fd, 0,
GLNX_AUTO_PREFIX_ERROR("opcode set-read-source", error);
guint64 source_offset;
- if (state->read_source_fd != -1)
- {
- (void) close (state->read_source_fd);
- state->read_source_fd = -1;
- }
+ glnx_close_fd (&state->read_source_fd);
if (!read_varuint64 (state, &source_offset, error))
return FALSE;
if (state->stats_only)
return TRUE; /* Early return */
- if (state->read_source_fd != -1)
- {
- (void) close (state->read_source_fd);
- state->read_source_fd = -1;
- }
-
+ glnx_close_fd (&state->read_source_fd);
g_clear_pointer (&state->read_source_object, g_free);
return TRUE;
g_free (self->stagedir_prefix);
g_clear_object (&self->repodir_fdrel);
g_clear_object (&self->repodir);
- if (self->repo_dir_fd != -1)
- (void) close (self->repo_dir_fd);
+ glnx_close_fd (&self->repo_dir_fd);
glnx_tmpdir_unset (&self->commit_stagedir);
glnx_release_lock_file (&self->commit_stagedir_lock);
- if (self->tmp_dir_fd != -1)
- (void) close (self->tmp_dir_fd);
- if (self->cache_dir_fd != -1)
- (void) close (self->cache_dir_fd);
- if (self->objects_dir_fd != -1)
- (void) close (self->objects_dir_fd);
- if (self->uncompressed_objects_dir_fd != -1)
- (void) close (self->uncompressed_objects_dir_fd);
+ glnx_close_fd (&self->tmp_dir_fd);
+ glnx_close_fd (&self->cache_dir_fd);
+ glnx_close_fd (&self->objects_dir_fd);
+ glnx_close_fd (&self->uncompressed_objects_dir_fd);
g_clear_object (&self->sysroot_dir);
g_weak_ref_clear (&self->sysroot);
g_free (self->remotes_config_dir);
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int repo_dfd = -1;
+ glnx_autofd int repo_dfd = -1;
if (!glnx_opendirat (dfd, path, TRUE, &repo_dfd, error))
return NULL;
gpgme_import_status_t import_status;
g_autofree char *source_tmp_dir = NULL;
g_autofree char *target_tmp_dir = NULL;
- glnx_fd_close int target_temp_fd = -1;
+ glnx_autofd int target_temp_fd = -1;
g_autoptr(GPtrArray) keys = NULL;
struct stat stbuf;
gpgme_error_t gpg_error;
}
else if (errno == ENOENT)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
/* Create an empty pubring.gpg file prior to importing keys. This
* prevents gpg2 from creating a pubring.kbx file in the new keybox
return FALSE;
if (errno == 0)
{
- glnx_fd_close int repo_dfd = -1;
+ glnx_autofd int repo_dfd = -1;
if (!glnx_opendirat (dfd, path, TRUE, &repo_dfd, error))
return FALSE;
return glnx_throw_errno_prefix (error, "mkdirat");
}
- glnx_fd_close int repo_dfd = -1;
+ glnx_autofd int repo_dfd = -1;
if (!glnx_opendirat (dfd, path, TRUE, &repo_dfd, error))
return FALSE;
g_variant_builder_add (builder, "{s@v}", "collection-id",
g_variant_new_variant (g_variant_new_string (self->collection_id)));
- glnx_fd_close int repo_dir_fd = -1;
+ glnx_autofd int repo_dir_fd = -1;
if (!repo_create_at_internal (AT_FDCWD, repopath, mode,
g_variant_builder_end (builder),
&repo_dir_fd,
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int repo_dfd = -1;
+ glnx_autofd int repo_dfd = -1;
if (!repo_create_at_internal (dfd, path, mode, options, &repo_dfd,
cancellable, error))
return NULL;
GCancellable *cancellable,
GError **error)
{
- int fd;
-
+ glnx_autofd int fd = -1;
if (!glnx_opendirat (dfd, path, TRUE, &fd, error))
return FALSE;
- if (self->cache_dir_fd != -1)
- close (self->cache_dir_fd);
- self->cache_dir_fd = fd;
+ glnx_close_fd (&self->cache_dir_fd);
+ self->cache_dir_fd = glnx_steal_fd (&fd);
return TRUE;
}
GError **error)
{
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
g_autoptr(GInputStream) ret_stream = NULL;
g_autoptr(GVariant) ret_variant = NULL;
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
_ostree_loose_path (loose_path_buf, checksum, OSTREE_OBJECT_TYPE_FILE, self->mode);
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!ot_openat_ignore_enoent (self->objects_dir_fd, loose_path_buf, &fd,
error))
return FALSE;
}
struct stat stbuf;
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
g_autofree char *ret_symlink = NULL;
g_autoptr(GVariant) ret_xattrs = NULL;
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
ret_symlink = g_strndup (targetbuf, target_size);
}
/* In the symlink case, we don't want to return the bare-user fd */
- (void) close (glnx_steal_fd (&fd));
+ glnx_close_fd (&fd);
}
}
else if (self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY)
cancellable, error);
else
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
struct stat stbuf;
g_autofree char *symlink_target = NULL;
g_autoptr(GVariant) ret_xattrs = NULL;
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!glnx_openat_rdonly (self->repo_dir_fd, "summary", TRUE, &fd, error))
return FALSE;
g_autoptr(GBytes) summary_data = ot_fd_readall_or_mmap (fd, 0, error);
if (!summary_data)
return FALSE;
/* Note that fd is reused below */
- (void) close (glnx_steal_fd (&fd));
+ glnx_close_fd (&fd);
g_autoptr(GVariant) existing_signatures = NULL;
if (!ot_openat_ignore_enoent (self->repo_dir_fd, "summary.sig", &fd, error))
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!ot_openat_ignore_enoent (self->repo_dir_fd, remote->keyring, &fd, error))
return FALSE;
return FALSE;
g_autofree char *superblock = _ostree_get_relative_static_delta_superblock_path ((from && from[0]) ? from : NULL, to);
- glnx_fd_close int superblock_file_fd = -1;
+ glnx_autofd int superblock_file_fd = -1;
if (!glnx_openat_rdonly (self->repo_dir_fd, superblock, TRUE, &superblock_file_fd, error))
return FALSE;
dent->d_type != DT_DIR)
continue;
- glnx_fd_close int target_dfd = -1;
+ glnx_autofd int target_dfd = -1;
if (!glnx_opendirat (dfd_iter.fd, dent->d_name, FALSE,
&target_dfd, &local_error))
{
g_autofree char *best_policy = NULL;
int best_version = 0;
- glnx_fd_close int bindir_dfd = -1;
+ glnx_autofd int bindir_dfd = -1;
if (!glnx_opendirat (AT_FDCWD, bindir_path, TRUE, &bindir_dfd, error))
return FALSE;
if (!g_hash_table_lookup (active_deployment_dirs, deployment_path))
{
struct stat stbuf;
- glnx_fd_close int deployment_fd = -1;
+ glnx_autofd int deployment_fd = -1;
if (!glnx_opendirat (self->sysroot_fd, deployment_path, TRUE,
&deployment_fd, error))
GError **error)
{
g_auto(GLnxDirFdIterator) src_dfd_iter = { 0, };
- glnx_fd_close int dest_dfd = -1;
+ glnx_autofd int dest_dfd = -1;
struct dirent *dent;
if (!glnx_dirfd_iterator_init_at (src_parent_dfd, name, TRUE, &src_dfd_iter, error))
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int src_dfd = -1;
- glnx_fd_close int target_dfd = -1;
+ glnx_autofd int src_dfd = -1;
+ glnx_autofd int target_dfd = -1;
g_assert (path != NULL);
g_assert (*path != '/' && *path != '\0');
if (!glnx_fstatat (modified_etc_fd, path, &modified_stbuf, AT_SYMLINK_NOFOLLOW, error))
return glnx_prefix_error (error, "Reading modified config file");
- glnx_fd_close int dest_parent_dfd = -1;
+ glnx_autofd int dest_parent_dfd = -1;
if (strchr (path, '/') != NULL)
{
g_autofree char *parent = g_path_get_dirname (path);
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int owned_merge_deployment_dfd = -1;
+ glnx_autofd int owned_merge_deployment_dfd = -1;
const OstreeSysrootDebugFlags flags = sysroot->debug_flags;
g_assert (merge_deployment != NULL && new_deployment != NULL);
_ostree_sysroot_emit_journal_msg (sysroot, msg);
}
- glnx_fd_close int orig_etc_fd = -1;
+ glnx_autofd int orig_etc_fd = -1;
if (!glnx_opendirat (merge_deployment_dfd, "usr/etc", TRUE, &orig_etc_fd, error))
return FALSE;
- glnx_fd_close int modified_etc_fd = -1;
+ glnx_autofd int modified_etc_fd = -1;
if (!glnx_opendirat (merge_deployment_dfd, "etc", TRUE, &modified_etc_fd, error))
return FALSE;
- glnx_fd_close int new_etc_fd = -1;
+ glnx_autofd int new_etc_fd = -1;
if (!glnx_opendirat (new_deployment_dfd, "etc", TRUE, &new_etc_fd, error))
return FALSE;
const char *csum = ostree_deployment_get_csum (deployment);
g_autofree char *checkout_target_name = NULL;
g_autofree char *osdeploy_path = NULL;
- glnx_fd_close int osdeploy_dfd = -1;
+ glnx_autofd int osdeploy_dfd = -1;
int ret_fd;
osdeploy_path = g_strconcat ("ostree/deploy/", ostree_deployment_get_osname (deployment), "/deploy", NULL);
static void
_ostree_kernel_layout_free (OstreeKernelLayout *layout)
{
- if (layout->boot_dfd != -1)
- (void) close (layout->boot_dfd);
+ glnx_close_fd (&layout->boot_dfd);
g_free (layout->kernel_srcpath);
g_free (layout->kernel_namever);
g_free (layout->initramfs_srcpath);
/* We found a module directory, compute the checksum */
g_auto(OtChecksum) checksum = { 0, };
ot_checksum_init (&checksum);
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
/* Checksum the kernel */
if (!glnx_openat_rdonly (ret_layout->boot_dfd, "vmlinuz", TRUE, &fd, error))
return FALSE;
if (!ot_gio_splice_update_checksum (NULL, in, &checksum, cancellable, error))
return FALSE;
g_clear_object (&in);
- (void) close (fd); fd = -1;
+ glnx_close_fd (&fd);
/* Look for an initramfs, but it's optional; since there wasn't any precedent
* for this, let's be a bit conservative and support both `initramfs.img` and
int sockpair[2];
if (socketpair (AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockpair) < 0)
return glnx_throw_errno_prefix (error, "socketpair");
- glnx_fd_close int sock_parent = sockpair[0];
- glnx_fd_close int sock_watchdog = sockpair[1];
+ glnx_autofd int sock_parent = sockpair[0];
+ glnx_autofd int sock_watchdog = sockpair[1];
pid_t pid = fork ();
if (pid < 0)
char c = '!';
if (pid == 0) /* Child watchdog/unfreezer process. */
{
- (void) close (glnx_steal_fd (&sock_parent));
+ glnx_close_fd (&sock_parent);
/* Daemonize, and mask SIGINT/SIGTERM, so we're likely to survive e.g.
* someone doing a `systemctl restart rpm-ostreed` or a Ctrl-C of
* `ostree admin upgrade`. We don't daemonize though if testing so
}
else /* Parent process. */
{
- (void) close (glnx_steal_fd (&sock_watchdog));
+ glnx_close_fd (&sock_watchdog);
/* Wait for the watchdog to say it's set up; mainly that it's
* masked SIGTERM successfully.
*/
out_stats->root_syncfs_msec = (end_msec - start_msec);
start_msec = g_get_monotonic_time () / 1000;
- glnx_fd_close int boot_dfd = -1;
+ glnx_autofd int boot_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, "boot", TRUE, &boot_dfd, error))
return FALSE;
if (!fsfreeze_thaw_cycle (self, boot_dfd, cancellable, error))
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int ostree_dfd = -1;
+ glnx_autofd int ostree_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, "ostree", TRUE, &ostree_dfd, error))
return FALSE;
if (!glnx_shutil_mkdir_p_at (ostree_dfd, ostree_subbootdir_name, 0755, cancellable, error))
return FALSE;
- glnx_fd_close int ostree_subbootdir_dfd = -1;
+ glnx_autofd int ostree_subbootdir_dfd = -1;
if (!glnx_opendirat (ostree_dfd, ostree_subbootdir_name, FALSE, &ostree_subbootdir_dfd, error))
return FALSE;
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int ostree_dfd = -1;
+ glnx_autofd int ostree_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, "ostree", TRUE, &ostree_dfd, error))
return FALSE;
{
OstreeBootconfigParser *bootconfig = ostree_deployment_get_bootconfig (deployment);
g_autofree char *deployment_dirpath = ostree_sysroot_get_deployment_dirpath (sysroot, deployment);
- glnx_fd_close int deployment_dfd = -1;
+ glnx_autofd int deployment_dfd = -1;
if (!glnx_opendirat (sysroot->sysroot_fd, deployment_dirpath, FALSE,
&deployment_dfd, error))
return FALSE;
cancellable, error))
return FALSE;
- glnx_fd_close int boot_dfd = -1;
+ glnx_autofd int boot_dfd = -1;
if (!glnx_opendirat (sysroot->sysroot_fd, "boot", TRUE, &boot_dfd, error))
return FALSE;
if (!glnx_shutil_mkdir_p_at (boot_dfd, bootcsumdir, 0775, cancellable, error))
return FALSE;
- glnx_fd_close int bootcsum_dfd = -1;
+ glnx_autofd int bootcsum_dfd = -1;
if (!glnx_opendirat (boot_dfd, bootcsumdir, TRUE, &bootcsum_dfd, error))
return FALSE;
g_autofree char *options_key = _ostree_kernel_args_to_string (kargs);
ostree_bootconfig_parser_set (bootconfig, "options", options_key);
- glnx_fd_close int bootconf_dfd = -1;
+ glnx_autofd int bootconf_dfd = -1;
if (!glnx_opendirat (boot_dfd, bootconfdir, TRUE, &bootconf_dfd, error))
return FALSE;
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int boot_dfd = -1;
+ glnx_autofd int boot_dfd = -1;
g_assert ((current_bootversion == 0 && new_bootversion == 1) ||
(current_bootversion == 1 && new_bootversion == 0));
g_autoptr(GPtrArray) tmp_current_deployments =
g_ptr_array_new_with_free_func (g_object_unref);
- glnx_fd_close int deploy_dfd = -1;
+ glnx_autofd int deploy_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, "ostree/deploy", TRUE, &deploy_dfd, error))
return FALSE;
osname = ostree_deployment_get_osname (self->booted_deployment);
const char *osdeploypath = glnx_strjoina ("ostree/deploy/", osname);
- glnx_fd_close int os_deploy_dfd = -1;
+ glnx_autofd int os_deploy_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, osdeploypath, TRUE, &os_deploy_dfd, error))
return FALSE;
ostree_deployment_set_origin (new_deployment, origin);
/* Check out the userspace tree onto the filesystem */
- glnx_fd_close int deployment_dfd = -1;
+ glnx_autofd int deployment_dfd = -1;
if (!checkout_deployment_tree (self, repo, new_deployment, &deployment_dfd,
cancellable, error))
{
return FALSE;
g_autofree char *deployment_path = ostree_sysroot_get_deployment_dirpath (self, deployment);
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!glnx_opendirat (self->sysroot_fd, deployment_path, TRUE, &fd, error))
return FALSE;
void
ostree_sysroot_unload (OstreeSysroot *self)
{
- if (self->sysroot_fd != -1)
- {
- (void) close (self->sysroot_fd);
- self->sysroot_fd = -1;
- }
+ glnx_close_fd (&self->sysroot_fd);
}
/**
&treecsum, &deployserial, error))
return FALSE;
- glnx_fd_close int deployment_dfd = -1;
+ glnx_autofd int deployment_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, relative_boot_link, TRUE,
&deployment_dfd, error))
return FALSE;
if (mkdirat (self->sysroot_fd, deploydir, 0777) < 0)
return glnx_throw_errno_prefix (error, "Creating %s", deploydir);
- glnx_fd_close int dfd = -1;
+ glnx_autofd int dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, deploydir, TRUE, &dfd, error))
return FALSE;
return FALSE;
g_autofree char *deployment_path = ostree_sysroot_get_deployment_dirpath (self, deployment);
- glnx_fd_close int deployment_dfd = -1;
+ glnx_autofd int deployment_dfd = -1;
if (!glnx_opendirat (self->sysroot_fd, deployment_path, TRUE, &deployment_dfd, error))
return FALSE;
GCancellable *cancellable,
GError **error)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!glnx_openat_rdonly (dfd, path, follow, &fd, error))
return FALSE;
*out_istream = g_unix_input_stream_new (glnx_steal_fd (&fd), TRUE);
gboolean *out_exists,
GError **error)
{
- glnx_fd_close int fd = glnx_opendirat_with_errno (dfd, path, TRUE);
+ glnx_autofd int fd = glnx_opendirat_with_errno (dfd, path, TRUE);
if (fd < 0)
{
if (errno != ENOENT)
if (msg->method == SOUP_METHOD_GET)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
g_autoptr(GMappedFile) mapping = NULL;
gsize buffer_length, file_size;
SoupRange *ranges;
const char *sysroot_path = argv[1];
- glnx_fd_close int root_dfd = -1;
+ glnx_autofd int root_dfd = -1;
if (!glnx_opendirat (AT_FDCWD, sysroot_path, TRUE, &root_dfd, error))
return FALSE;
&filter_data, NULL);
if (opt_selinux_policy)
{
- glnx_fd_close int rootfs_dfd = -1;
+ glnx_autofd int rootfs_dfd = -1;
if (!glnx_opendirat (AT_FDCWD, opt_selinux_policy, TRUE, &rootfs_dfd, error))
{
g_prefix_error (error, "selinux-policy: ");
const char *mount_root_path = argv[1];
struct stat mount_root_stbuf;
- glnx_fd_close int mount_root_dfd = -1;
+ glnx_autofd int mount_root_dfd = -1;
if (!glnx_opendirat (AT_FDCWD, mount_root_path, TRUE, &mount_root_dfd, error))
return FALSE;
if (!glnx_fstat (mount_root_dfd, &mount_root_stbuf, error))
{
g_autoptr(GVariant) variant = NULL;
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!glnx_openat_rdonly (AT_FDCWD, filename, TRUE, &fd, error))
return FALSE;
if (!ot_variant_read_fd (fd, 0, type, FALSE, &variant, error))
if (opt_raw)
flags |= OSTREE_DUMP_RAW;
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
if (!glnx_openat_rdonly (repo->repo_dir_fd, "summary", TRUE, &fd, error))
return FALSE;
summary_data = ot_fd_readall_or_mmap (fd, 0, error);
{
OtCookieParser *parser;
g_autofree char *cookies_content = NULL;
- glnx_fd_close int infd = -1;
+ glnx_autofd int infd = -1;
infd = openat (dfd, path, O_RDONLY | O_CLOEXEC);
if (infd < 0)
const char *name, const char *value,
GError **error)
{
- glnx_fd_close int fd = openat (dfd, jar_path, O_WRONLY | O_APPEND | O_CREAT, 0644);
+ glnx_autofd int fd = openat (dfd, jar_path, O_WRONLY | O_APPEND | O_CREAT, 0644);
if (fd < 0)
return glnx_throw_errno_prefix (error, "open(%s)", jar_path);
static int
callback_truncate (const char *path, off_t size)
{
- glnx_fd_close int fd = -1;
+ glnx_autofd int fd = -1;
path = ENSURE_RELPATH (path);
VERIFY_WRITE(path);
int *out_repos_dfd,
GMount **out_mount)
{
- glnx_fd_close int repos_dfd = -1;
+ glnx_autofd int repos_dfd = -1;
g_autoptr(GError) error = NULL;
g_autofree gchar *path = g_build_filename (mount_root_name, ".ostree", "repos.d", NULL);
gchar **out_uri,
...)
{
- glnx_fd_close int ref_dfd = -1;
+ glnx_autofd int ref_dfd = -1;
g_autoptr(OstreeRepo) repo = NULL;
g_autoptr(GError) error = NULL;
va_list args;
g_autoptr(GMount) repo1_mount = NULL;
g_autoptr(GMount) repo2_mount = NULL;
g_autoptr(GFile) non_removable_root = NULL;
- glnx_fd_close int no_repos_repos = -1;
- glnx_fd_close int repo1_repos = -1;
- glnx_fd_close int repo2_repos = -1;
+ glnx_autofd int no_repos_repos = -1;
+ glnx_autofd int repo1_repos = -1;
+ glnx_autofd int repo2_repos = -1;
g_autoptr(OstreeRepo) repo1_repo_a = NULL, repo1_repo_b = NULL;
g_autoptr(OstreeRepo) repo2_repo_a = NULL;
g_autofree gchar *repo1_repo_a_uri = NULL, *repo1_repo_b_uri = NULL;
g_autoptr(GError) error = NULL;
g_autoptr(GList) mounts = NULL; /* (element-type OstreeMockMount) */
g_autoptr(GMount) mount = NULL;
- glnx_fd_close int repos = -1;
+ glnx_autofd int repos = -1;
g_autoptr(OstreeRepo) repo_a = NULL, repo_b = NULL;
g_autofree gchar *repo_a_uri = NULL, *repo_b_uri = NULL;
g_autofree gchar *ref_a_checksum = NULL, *ref_b_checksum = NULL;
projects / ostree.git / commitdiff