Antonio S. Musumeci
0bdbaf1d6c
libfuse: remove userdata from init/destroy APIs; drop unused fuse_reply_ioctl_iov
...
The low-level init/destroy callbacks were passed a userdata pointer
that mergerfs never consumed - the caller threaded it through
fuse_lowlevel_new only to hand it back unchanged. Remove the
parameter from the ops struct, from fuse_lowlevel_new(_common),
and from the internal fuse_ll struct; update fuse_lib_init and
fuse_lib_destroy accordingly.
Also drop fuse_reply_ioctl_iov: no caller in-tree invokes it and
the public API is defined by this vendored libfuse fork.
2026-04-18 13:47:23 -05:00
Antonio S. Musumeci
e67b7d0825
log: default debug log path to empty; skip set when empty
...
libfuse previously initialized its debug log filepath to
"/dev/stderr", forcing the config layer to reopen stderr on every
load whether or not the user asked for it. Default the libfuse log
path to "" and have the mergerfs config layer only forward the
request to libfuse when the user supplied an explicit path.
2026-04-18 13:47:23 -05:00
Antonio SJ Musumeci
f2c8e5d9eb
Add FUSE request_timeout
...
mkdocs / deploy (push) Has been cancelled
Not yet hooked up to config parser to set as need to evaluate usage.
2026-04-01 23:20:05 -05:00
Antonio SJ Musumeci
b581c5d5e7
Add support for FUSE_COPY_FILE_RANGE_64
2026-04-01 23:20:05 -05:00
Antonio SJ Musumeci
7fc20457ca
Rework open file resource management
2026-03-31 19:53:17 -04:00
Antonio SJ Musumeci
06433a0548
Fallback to fusermount3 where available
...
mkdocs / deploy (push) Has been cancelled
Also general cleanup of mount_generic.
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
a78aef36e0
Additional check for ENOTCONN on mount
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
0d05523dfd
Move maintainence thread func take u64 rather than int
...
signed rollover is UB
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
0cfab60f37
replace raw C-strings with std::string in converted libfuse files
...
util/mount.mergerfs.cpp:
- Remove xstrdup/xrealloc wrappers entirely
- Convert type, source, options, command, setuid to std::string
- Replace add_arg() pointer-rewriting with shell_quote() returning std::string
- Replace add_option() with simple std::string += concatenation
- Fix const_cast UB on string literal assignment
lib/helper.cpp:
- Convert add_default_subtype local subtype_opt: malloc+snprintf+free -> std::string construction
lib/mount_generic.h:
- Convert fuse_mount_sys locals source/type: malloc+strcpy+strcat -> std::string
- Remove 4 unnecessary free() calls (RAII cleanup)
- .c_str() at mount() and fuse_mnt_add_mount() boundaries
lib/mount_util.h:
- Rewrite fuse_mnt_resolve_path internals using std::string: rfind/substr
instead of manual pointer arithmetic, strrchr, strlen chains
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
21966ade97
Convert vendored/libfuse C sources to C++17
...
Convert all C source files in vendored/libfuse/ to C++17:
- lib/crc32b.c -> crc32b.cpp (const void* cast)
- lib/fuse_opt.c -> fuse_opt.cpp (designated init, void* arithmetic)
- lib/fuse_signals.c -> fuse_signals.cpp
- lib/helper.c -> helper.cpp (void* data cast)
- lib/mount.c -> mount.cpp (thin wrapper)
- lib/mount_generic.c -> mount_generic.h (static inline, #pragma once)
- lib/mount_bsd.c -> mount_bsd.h (static inline, #pragma once)
- lib/mount_util.c -> mount_util.h (static inline, #pragma once)
- util/fusermount.c -> fusermount.cpp
- util/mount.mergerfs.c -> mount.mergerfs.cpp
Key changes:
- Replace C99 designated initializer in fuse_opt_parse with field-by-field init
- Fix void* pointer arithmetic via char* base + offset pattern
- All C-style (T*)voidptr casts replaced with static_cast/reinterpret_cast
- Remove redundant #define _GNU_SOURCE (already in FUSE_FLAGS)
- Wrap __clone2 declaration in extern "C" for ia64 path
- Update Makefile: empty SRC_C, build utils with $(CXX) instead of $(CC)
- Remove stale .c files now replaced by .cpp/.h counterparts
All binaries build cleanly: mergerfs, mergerfs-fusermount, mount.mergerfs
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
96eb51eecb
Move fuse_session to C++ and make exit flag atomic
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
881147daa2
Fix null ptr handling issue in ioctl processing
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
3099b15db1
More aggressive error handing with pagesize queries
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
07b1e6bdba
Auto-commit fuse_msgbuf.cpp
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
7763c7384a
Use fatal::abort() rather than assert in places
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
61365d226d
Move scope_guard to vendored/
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
076e359891
Improve thread pool
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
e5d897f3dc
Ensure zero initialized timeouts structs
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
1b1e14ca29
Remove dead branch in fuse_reply_data
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
82b89aa099
Change session->exited to sig_atomic_t
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
aa91e1b2ba
Initialize stat buffer and add stat call in fuse_mount_sys
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
82e81afcdc
Add NULL check for cmsg in receive_fd to prevent segfault
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
5a9a17afcb
fix objpool: add size tracking, improve allocation matching; fix msgbuf: clear pool on size change
2026-03-24 21:13:34 -04:00
Antonio SJ Musumeci
04939bbe72
No longer explicitly error out on broken mount point
...
mkdocs / deploy (push) Has been cancelled
If ENOTCONN (broken FUSE mount) umount first and continue to mount.
2026-03-08 00:39:45 -05:00
Antonio SJ Musumeci
53c5a2cf1e
Move fmtlib to vendored and upgrade to 12.1.0
2026-03-02 01:09:16 -05:00
Antonio SJ Musumeci
8f1ef59770
Move 3rd party libraries to "vendored" directory
2026-03-02 01:09:16 -05:00