Skip to content
Snippets Groups Projects
Commit f51b5aa2 authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'wip/smcv/libglnx' into 'main'

Update libglnx to 2025-01-06

Closes #1 and #5

See merge request !777
parents 6d2a4aa2 9509306b
Branches
Tags
1 merge request!777Update libglnx to 2025-01-06
......@@ -321,6 +321,8 @@ glnx_open_anonymous_tmpfile (int flags,
error);
}
static const char proc_self_fd_slash[] = "/proc/self/fd/";
/* Use this after calling glnx_open_tmpfile_linkable_at() to give
* the file its final name (link into place).
*/
......@@ -367,8 +369,8 @@ glnx_link_tmpfile_at (GLnxTmpfile *tmpf,
else
{
/* This case we have O_TMPFILE, so our reference to it is via /proc/self/fd */
char proc_fd_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(tmpf->fd) + 1];
snprintf (proc_fd_path, sizeof (proc_fd_path), "/proc/self/fd/%i", tmpf->fd);
char proc_fd_path[sizeof (proc_self_fd_slash) + DECIMAL_STR_MAX(tmpf->fd)];
snprintf (proc_fd_path, sizeof (proc_fd_path), "%s%i", proc_self_fd_slash, tmpf->fd);
if (replace)
{
......@@ -455,8 +457,8 @@ glnx_tmpfile_reopen_rdonly (GLnxTmpfile *tmpf,
else
{
/* This case we have O_TMPFILE, so our reference to it is via /proc/self/fd */
char proc_fd_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(tmpf->fd) + 1];
snprintf (proc_fd_path, sizeof (proc_fd_path), "/proc/self/fd/%i", tmpf->fd);
char proc_fd_path[sizeof (proc_self_fd_slash) + DECIMAL_STR_MAX(tmpf->fd)];
snprintf (proc_fd_path, sizeof (proc_fd_path), "%s%i", proc_self_fd_slash, tmpf->fd);
if (!glnx_openat_rdonly (AT_FDCWD, proc_fd_path, TRUE, &rdonly_fd, error))
return FALSE;
......
......@@ -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)
{
......
......@@ -5,5 +5,5 @@ option(
'tests',
type : 'boolean',
description : 'build and run unit tests',
value : 'true',
value : true,
)
/* -*- 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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment