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: Fix errno handling from posix_fallocate() and loop_write()

Browse Source 
For extra fun, both of these functions have different error handling
schemes.  `posix_fallocate` does *not* set `errno` because...  I'm not
sure.  Maybe POSIX was trying a new function design?

`loop_write` uses the systemd error handling style which returns
`-errno`, so we need to set errno back so that the macro can propagate
it into the `GError`.
This commit is contained in:
Colin Walters
2015-04-14 08:40:42 -04:00
parent c36ea3ea80
commit 371172bcfd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
glnx-fdio.c
View File

@@ -647,6 +647,7 @@ glnx_file_replace_contents_with_perms_at (int dfd,
GError **error)
{
gboolean ret = FALSE;
int r;
/* We use the /proc/self trick as there's no mkostemp_at() yet */
g_autofree char *tmppath = g_strdup_printf ("/proc/self/fd/%d/.tmpXXXXXX", dfd);
glnx_fd_close int fd = -1;
@@ -663,14 +664,18 @@ glnx_file_replace_contents_with_perms_at (int dfd,
if (len == -1)
len = strlen ((char*)buf);
if (posix_fallocate (fd, 0, len))
/* Note that posix_fallocate does *not* set errno but returns it. */
r = posix_fallocate (fd, 0, len);
if (r != 0)
{
errno = r;
glnx_set_error_from_errno (error);
goto out;
}
if (loop_write (fd, buf, len) != 0)
if ((r = loop_write (fd, buf, len)) != 0)
{
errno = -r;
glnx_set_error_from_errno (error);
goto out;
}