mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-28 11:54:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fdio: Allow using AT_FDCWD with GlnxTmpfile

Browse Source 
Add an `initialized` member which means we work by default
in structs allocated with `g_new0` etc. and don't need
a special initializer.  This also fixes a bug where
we need to support `src_dfd == -1` or `AT_FDCWD`.

This fixes flatpak which uses AT_FDCWD.

Modified-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Alexander Larsson
2017-05-19 11:26:55 +02:00
committed by Colin Walters
parent 4fbd48fb88
commit 2f8fdf80ec
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
glnx-fdio.c
View File

@@ -150,7 +150,7 @@ glnx_renameat2_exchange (int olddirfd, const char *oldpath,
void
glnx_tmpfile_clear (GLnxTmpfile *tmpf)
{
if (tmpf->src_dfd == -1)
if (!tmpf->initialized)
return;
if (tmpf->fd == -1)
return;
@@ -182,6 +182,8 @@ glnx_open_tmpfile_linkable_at (int dfd,
glnx_fd_close int fd = -1;
int count;
dfd = glnx_dirfd_canonicalize (dfd);
/* Don't allow O_EXCL, as that has a special meaning for O_TMPFILE */
g_return_val_if_fail ((flags & O_EXCL) == 0, FALSE);
@@ -197,8 +199,9 @@ glnx_open_tmpfile_linkable_at (int dfd,
return glnx_throw_errno_prefix (error, "open(O_TMPFILE)");
if (fd != -1)
{
out_tmpf->src_dfd = dfd;
out_tmpf->fd = fd; fd = -1; /* Transfer */
out_tmpf->initialized = TRUE;
out_tmpf->src_dfd = dfd; /* Copied; caller must keep open */
out_tmpf->fd = glnx_steal_fd (&fd);
out_tmpf->path = NULL;
return TRUE;
}
@@ -222,8 +225,9 @@ glnx_open_tmpfile_linkable_at (int dfd,
}
else
{
out_tmpf->src_dfd = dfd;
out_tmpf->fd = fd; fd = -1; /* Transfer */
out_tmpf->initialized = TRUE;
out_tmpf->src_dfd = dfd; /* Copied; caller must keep open */
out_tmpf->fd = glnx_steal_fd (&fd);
out_tmpf->path = g_steal_pointer (&tmp);
return TRUE;
}
@@ -247,7 +251,7 @@ glnx_link_tmpfile_at (GLnxTmpfile *tmpf,
const gboolean replace = (mode == GLNX_LINK_TMPFILE_REPLACE);
const gboolean ignore_eexist = (mode == GLNX_LINK_TMPFILE_NOREPLACE_IGNORE_EXIST);
g_return_val_if_fail (tmpf->src_dfd >= 0, FALSE);
g_return_val_if_fail (tmpf->fd >= 0, FALSE);
/* Unlike the original systemd code, this function also supports
* replacing existing files.
@@ -928,7 +932,7 @@ glnx_file_replace_contents_with_perms_at (int dfd,
if (mode == (mode_t) -1)
mode = 0644;
g_auto(GLnxTmpfile) tmpf = GLNX_TMPFILE_INIT;
g_auto(GLnxTmpfile) tmpf = { 0, };
if (!glnx_open_tmpfile_linkable_at (dfd, dn, O_WRONLY | O_CLOEXEC,
&tmpf, error))
return FALSE;

2
glnx-fdio.h
View File

@@ -49,11 +49,11 @@ const char *glnx_basename (const char *path)
}
typedef struct {
gboolean initialized;
int src_dfd;
int fd;
char *path;
} GLnxTmpfile;
#define GLNX_TMPFILE_INIT { .src_dfd = -1 };
void glnx_tmpfile_clear (GLnxTmpfile *tmpf);
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GLnxTmpfile, glnx_tmpfile_clear);