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

Merge pull request #6043 from smcv/libglnx-2024-12-06

Browse Source 
Update subtree: libglnx 2024-12-06
This commit is contained in:
Simon McVittie
2025-01-02 14:47:30 +00:00
committed by GitHub
parent 7a6c98c563 5f1938437a
commit 8882a7f0a8
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
subprojects/libglnx/glnx-shutil.c
View File

@@ -149,12 +149,10 @@ mkdir_p_at_internal (int dfd,
again:
if (mkdirat (dfd, path, mode) == -1)
{
if (errno == ENOENT)
if (errno == ENOENT && !did_recurse)
{
char *lastslash;
g_assert (!did_recurse);
lastslash = strrchr (path, '/');
if (lastslash == NULL)
{

2
subprojects/libglnx/meson_options.txt
View File

@@ -5,5 +5,5 @@ option(
'tests',
type : 'boolean',
description : 'build and run unit tests',
value : 'true',
value : true,
)

42
subprojects/libglnx/tests/test-libglnx-shutil.c
View File

@@ -1,6 +1,7 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright © 2017 Endless OS Foundation LLC
* Copyright © 2017-2019 Endless OS Foundation LLC
* Copyright © 2024 Collabora Ltd.
* SPDX-License-Identifier: LGPL-2.0-or-later
*
* This library is free software; you can redistribute it and/or
@@ -29,9 +30,47 @@
#include "libglnx-testlib.h"
static void
test_mkdir_p_parent_unsuitable (void)
{
_GLNX_TEST_SCOPED_TEMP_DIR;
_GLNX_TEST_DECLARE_ERROR(local_error, error);
glnx_autofd int dfd = -1;
if (!glnx_ensure_dir (AT_FDCWD, "test", 0755, error))
return;
if (!glnx_opendirat (AT_FDCWD, "test", FALSE, &dfd, error))
return;
if (!glnx_file_replace_contents_at (dfd, "file",
(const guint8 *) "", 0,
GLNX_FILE_REPLACE_NODATASYNC,
NULL, error))
return;
if (symlinkat ("nosuchtarget", dfd, "link") < 0)
{
glnx_throw_errno_prefix (error, "symlinkat");
return;
}
glnx_shutil_mkdir_p_at (dfd, "file/baz", 0755, NULL, error);
g_test_message ("mkdir %s -> %s", "file/baz",
local_error ? local_error->message : "success");
g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_NOT_DIRECTORY);
g_clear_error (&local_error);
glnx_shutil_mkdir_p_at (dfd, "link/baz", 0755, NULL, error);
g_test_message ("mkdir %s -> %s", "link/baz",
local_error ? local_error->message : "success");
g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND);
g_clear_error (&local_error);
}
static void
test_mkdir_p_enoent (void)
{
_GLNX_TEST_SCOPED_TEMP_DIR;
_GLNX_TEST_DECLARE_ERROR(local_error, error);
glnx_autofd int dfd = -1;
@@ -57,6 +96,7 @@ main (int argc,
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/mkdir-p/enoent", test_mkdir_p_enoent);
g_test_add_func ("/mkdir-p/parent-unsuitable", test_mkdir_p_parent_unsuitable);
ret = g_test_run();