From 53607e073d075ad1984f7015187d203a3ae83297 Mon Sep 17 00:00:00 2001 From: Bernd Schubert Date: Sun, 18 May 2025 00:24:07 +0200 Subject: conn->want conversion: Fix fuse_apply_conn_info_opts() fuse_apply_conn_info_opts() was applying to 'want_ext', which would cause conflicts with 'want' if the application applied its own flags to 'conn->want'. Solution is: - to move fuse_{set,unset,get}_feature_flag and convert_to_conn_want_ext() to fuse_lowlevel.c and to define them as part of the public API, although convert_to_conn_want_ext() should not be used - it is currently needed to be a public function due as it needs to be defined for the tests. Related to https://github.com/libfuse/libfuse/issues/1171 and https://github.com/libfuse/libfuse/pull/1172. Closes: https://github.com/libfuse/libfuse/issues/1171 Signed-off-by: Bernd Schubert (cherry picked from commit baadab0492a495fda98216b351976d2e5d6d0866) --- lib/util.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/util.c') diff --git a/lib/util.c b/lib/util.c index a529d38..956c3d2 100644 --- a/lib/util.c +++ b/lib/util.c @@ -1,7 +1,14 @@ #include #include +#ifndef FUSE_USE_VERSION +#define FUSE_USE_VERSION (FUSE_MAKE_VERSION(3, 18)) +#endif + #include "util.h" +#include "fuse_log.h" +#include "fuse_lowlevel.h" +#include int libfuse_strtol(const char *str, long *res) { @@ -25,3 +32,4 @@ int libfuse_strtol(const char *str, long *res) *res = val; return 0; } + -- cgit v1.2.3