Daan De Meyer
f795d54591
For libc syscall wrappers (pidfd_open, fsopen, openat2, etc.) we previously gated the calls behind build-time HAVE_* checks. Replace these with shim functions in src/libc/ that fall back to the raw syscall at runtime when the loaded glibc lacks the symbol. The infrastructure lives in src/libc/libc-shim.h: DEFINE_SYSCALL_SHIM falls back to a direct syscall, DEFINE_LIBC_SHIM returns ENOSYS (for posix_spawn-family helpers that have no corresponding syscall), and DEFINE_LIBC_ERRNO_SHIM sets errno=ENOSYS and returns -1 (for read/write-style helpers). The weak reference to the libc symbol is bound via __asm__(\"name\") rename so the bare libc identifier never appears as a C token — this avoids both #undef boilerplate against override-header redirects and the resulting -Wredundant-decls warning. Drop the corresponding cc.has_function() loop from meson.build. For optional libraries (libcryptsetup, libdw, libarchive), drop the per-symbol HAVE_* checks. Always declare the prototypes, suppressing the redundant-decl warnings via DISABLE_WARNING_REDUNDANT_DECLS and NOLINT, and resolve the symbols after the main dlopen via a new DLSYM_OPTIONAL() helper that only assigns on success. libcryptsetup's crypt_set_keyring_to_link / crypt_token_set_external_path and libarchive's *_is_set wrappers use fallback functions as their pointer initializers (returning -ENOSYS and 0 respectively), so call sites can invoke the symbol unconditionally and just check for -ENOSYS where the \"not supported\" distinction matters. The same shim treatment applies to pidfd_spawn / posix_spawnattr_setcgroup_np (src/libc/spawn.c) and epoll_pwait2 (src/libc/epoll.c), with corresponding override headers in src/include/override/spawn.h and src/include/override/sys/epoll.h. posix_spawn_wrapper() in process-util.c and epoll_wait_usec() in sd-event.c now detect ENOSYS in the return value instead of checking the function pointer, falling back to plain posix_spawn() and epoll_wait() respectively. coredump-config and coredump-submit get a dlopen_dw_has_dwfl_set_sysroot() helper. The kexec arch gate now uses defined(__NR_kexec_file_load) directly; pidfd.h uses __has_include_next() to decide whether to pull in glibc's header. This lets binaries built against newer glibc / libcryptsetup / libdw / libarchive headers still load and run on older targets where these symbols are absent.
88 lines
3.8 KiB
C
88 lines
3.8 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
#pragma once
|
|
|
|
#include "shared-forward.h"
|
|
|
|
#if HAVE_LIBARCHIVE
|
|
#include <archive.h> /* IWYU pragma: export */
|
|
#include <archive_entry.h> /* IWYU pragma: export */
|
|
|
|
#include "dlfcn-util.h"
|
|
|
|
/* Newer symbols that might not be in the header we build against. Always redeclare so DLSYM_PROTOTYPE's
|
|
* typeof() resolves; suppress the warning when newer libarchive already declared them. */
|
|
DISABLE_WARNING_REDUNDANT_DECLS;
|
|
/* NOLINTBEGIN(readability-redundant-declaration) */
|
|
extern int archive_entry_gid_is_set(struct archive_entry *e);
|
|
extern int archive_entry_hardlink_is_set(struct archive_entry *e);
|
|
extern int archive_entry_uid_is_set(struct archive_entry *e);
|
|
/* NOLINTEND(readability-redundant-declaration) */
|
|
REENABLE_WARNING;
|
|
|
|
extern DLSYM_PROTOTYPE(archive_entry_acl_add_entry);
|
|
extern DLSYM_PROTOTYPE(archive_entry_acl_next);
|
|
extern DLSYM_PROTOTYPE(archive_entry_acl_reset);
|
|
extern DLSYM_PROTOTYPE(archive_entry_fflags);
|
|
extern DLSYM_PROTOTYPE(archive_entry_filetype);
|
|
extern DLSYM_PROTOTYPE(archive_entry_free);
|
|
extern DLSYM_PROTOTYPE(archive_entry_gid);
|
|
extern DLSYM_PROTOTYPE(archive_entry_gid_is_set);
|
|
extern DLSYM_PROTOTYPE(archive_entry_hardlink);
|
|
extern DLSYM_PROTOTYPE(archive_entry_hardlink_is_set);
|
|
extern DLSYM_PROTOTYPE(archive_entry_mode);
|
|
extern DLSYM_PROTOTYPE(archive_entry_mtime);
|
|
extern DLSYM_PROTOTYPE(archive_entry_mtime_is_set);
|
|
extern DLSYM_PROTOTYPE(archive_entry_mtime_nsec);
|
|
extern DLSYM_PROTOTYPE(archive_entry_new);
|
|
extern DLSYM_PROTOTYPE(archive_entry_pathname);
|
|
extern DLSYM_PROTOTYPE(archive_entry_rdevmajor);
|
|
extern DLSYM_PROTOTYPE(archive_entry_rdevminor);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_ctime);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_fflags);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_filetype);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_gid);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_hardlink);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_mtime);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_pathname);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_perm);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_rdevmajor);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_rdevminor);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_size);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_symlink);
|
|
extern DLSYM_PROTOTYPE(archive_entry_set_uid);
|
|
extern DLSYM_PROTOTYPE(archive_entry_sparse_add_entry);
|
|
extern DLSYM_PROTOTYPE(archive_entry_symlink);
|
|
extern DLSYM_PROTOTYPE(archive_entry_uid);
|
|
extern DLSYM_PROTOTYPE(archive_entry_uid_is_set);
|
|
extern DLSYM_PROTOTYPE(archive_entry_xattr_add_entry);
|
|
extern DLSYM_PROTOTYPE(archive_entry_xattr_next);
|
|
extern DLSYM_PROTOTYPE(archive_entry_xattr_reset);
|
|
extern DLSYM_PROTOTYPE(archive_error_string);
|
|
extern DLSYM_PROTOTYPE(archive_read_data_into_fd);
|
|
extern DLSYM_PROTOTYPE(archive_read_free);
|
|
extern DLSYM_PROTOTYPE(archive_read_new);
|
|
extern DLSYM_PROTOTYPE(archive_read_next_header);
|
|
extern DLSYM_PROTOTYPE(archive_read_open_fd);
|
|
extern DLSYM_PROTOTYPE(archive_read_support_format_cpio);
|
|
extern DLSYM_PROTOTYPE(archive_read_support_format_tar);
|
|
extern DLSYM_PROTOTYPE(archive_write_close);
|
|
extern DLSYM_PROTOTYPE(archive_write_data);
|
|
extern DLSYM_PROTOTYPE(archive_write_free);
|
|
extern DLSYM_PROTOTYPE(archive_write_header);
|
|
extern DLSYM_PROTOTYPE(archive_write_new);
|
|
extern DLSYM_PROTOTYPE(archive_write_open_FILE);
|
|
extern DLSYM_PROTOTYPE(archive_write_open_fd);
|
|
extern DLSYM_PROTOTYPE(archive_write_set_format_filter_by_ext);
|
|
extern DLSYM_PROTOTYPE(archive_write_set_format_pax);
|
|
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct archive_entry*, sym_archive_entry_free, archive_entry_freep, NULL);
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct archive*, sym_archive_write_free, archive_write_freep, NULL);
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct archive*, sym_archive_read_free, archive_read_freep, NULL);
|
|
|
|
#else
|
|
|
|
|
|
#endif
|
|
|
|
int dlopen_libarchive(int log_level);
|