lkn
/
pcloudcc-lneely
mirror of https://github.com/lneely/pcloudcc-lneely.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pcl-1ib: correct FUSE 3.x handler signatures and loop_mt call 

- Replace FUSE_MINOR_VERSION >= 12 checks with FUSE_USE_VERSION >= 30
  for getattr/chmod/chown/utimens handler signatures; FUSE 3.x always
  requires the extra struct fuse_file_info* parameter — the wrong
  signature caused type mismatches and "Transport endpoint is not
  connected" failures
- Replace non-existent fuse_loop_mt_312 extern with correct conditional:
  FUSE_USE_VERSION >= 32 uses fuse_loop_mt(f, &config), else
  fuse_loop_mt_31(f, clone_fd)
- Fix inverted return logic in is_fuse3_installed_on_system(): was
  returning 0 on success (when fusermount3 found), now correctly
  returns non-zero

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Levi Neely 2026-03-08 09:27:26 +01:00
parent 177b951cd3
commit a59e536bb5
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pclsync/pfs.c
View File

@ -787,7 +787,7 @@ static int pfs_getrootattr(struct FUSE_STAT *stbuf) {
} \ } \
} while (0) } while (0)
#if defined(FUSE_MAJOR_VERSION) && defined(FUSE_MINOR_VERSION) && (FUSE_MAJOR_VERSION > 3 || (FUSE_MAJOR_VERSION == 3 && FUSE_MINOR_VERSION >= 12)) #if FUSE_USE_VERSION >= 30
static int pfs_getattr(const char *path, struct FUSE_STAT *stbuf, struct fuse_file_info *fi) { static int pfs_getattr(const char *path, struct FUSE_STAT *stbuf, struct fuse_file_info *fi) {
#else #else
static int pfs_getattr(const char *path, struct FUSE_STAT *stbuf) { static int pfs_getattr(const char *path, struct FUSE_STAT *stbuf) {
@ -3086,7 +3086,7 @@ static int pfs_statfs(const char *path, struct statvfs *stbuf) {
return 0; return 0;
} }
#if defined(FUSE_MAJOR_VERSION) && defined(FUSE_MINOR_VERSION) && (FUSE_MAJOR_VERSION > 3 || (FUSE_MAJOR_VERSION == 3 && FUSE_MINOR_VERSION >= 12)) #if FUSE_USE_VERSION >= 30
static int pfs_chmod(const char *path, mode_t mode, struct fuse_file_info *fi) { static int pfs_chmod(const char *path, mode_t mode, struct fuse_file_info *fi) {
#else #else
static int pfs_chmod(const char *path, mode_t mode) { static int pfs_chmod(const char *path, mode_t mode) {
@ -3096,7 +3096,7 @@ static int pfs_chmod(const char *path, mode_t mode) {
return 0; return 0;
} }
#if defined(FUSE_MAJOR_VERSION) && defined(FUSE_MINOR_VERSION) && (FUSE_MAJOR_VERSION > 3 || (FUSE_MAJOR_VERSION == 3 && FUSE_MINOR_VERSION >= 12)) #if FUSE_USE_VERSION >= 30
static int pfs_chown(const char *path, uid_t uid, gid_t gid, struct fuse_file_info *fi) { static int pfs_chown(const char *path, uid_t uid, gid_t gid, struct fuse_file_info *fi) {
#else #else
static int pfs_chown(const char *path, uid_t uid, gid_t gid) { static int pfs_chown(const char *path, uid_t uid, gid_t gid) {
@ -3266,7 +3266,7 @@ static int pfs_setcrtime(const char *path, const struct timespec *tv) {
} }
#endif #endif
#if defined(FUSE_MAJOR_VERSION) && defined(FUSE_MINOR_VERSION) && (FUSE_MAJOR_VERSION > 3 || (FUSE_MAJOR_VERSION == 3 && FUSE_MINOR_VERSION >= 12)) #if FUSE_USE_VERSION >= 30
static int pfs_utimens(const char *path, const struct timespec tv[2], struct fuse_file_info *fi) { static int pfs_utimens(const char *path, const struct timespec tv[2], struct fuse_file_info *fi) {
#else #else
static int pfs_utimens(const char *path, const struct timespec tv[2]) { static int pfs_utimens(const char *path, const struct timespec tv[2]) {
@ -3704,17 +3704,13 @@ static void psync_fuse_thread() {
} }
pthread_mutex_unlock(&start_mutex); pthread_mutex_unlock(&start_mutex);
pdbg_logf(D_NOTICE, "running fuse_loop_mt"); pdbg_logf(D_NOTICE, "running fuse_loop_mt");
#if FUSE_USE_VERSION >= 30 #if FUSE_USE_VERSION >= 32
struct fuse_loop_config loop_config; struct fuse_loop_config loop_config;
loop_config.clone_fd = 1; loop_config.clone_fd = 1;
loop_config.max_idle_threads = 10; loop_config.max_idle_threads = 10;
#if defined(FUSE_MAJOR_VERSION) && defined(FUSE_MINOR_VERSION) && (FUSE_MAJOR_VERSION > 3 || (FUSE_MAJOR_VERSION == 3 && FUSE_MINOR_VERSION >= 12)) fr = fuse_loop_mt(psync_fuse, &loop_config);
/* FUSE 3.12+ uses fuse_loop_mt_312 or direct fuse_loop_mt */ #elif FUSE_USE_VERSION >= 30
extern int fuse_loop_mt_312(struct fuse *f, struct fuse_loop_config *config); fr = fuse_loop_mt_31(psync_fuse, 1);
fr = fuse_loop_mt_312(psync_fuse, &loop_config);
#else
fr = fuse_loop_mt_31(psync_fuse, loop_config.clone_fd);
#endif
#else #else
fr = fuse_loop_mt(psync_fuse); fr = fuse_loop_mt(psync_fuse);
#endif #endif
@ -3741,14 +3737,10 @@ static char is_fuse3_installed_on_system() {
char output[1024]; char output[1024];
memset(output, 0, sizeof(output)); memset(output, 0, sizeof(output));
if (fgets(output, sizeof(output), pipe) != NULL) { int has_output = (fgets(output, sizeof(output), pipe) != NULL);
return 0;
}
pclose(pipe); pclose(pipe);
size_t outlen = strlen(output);
return outlen > 0; return has_output && output[0] != '\0';
} }
static int pfs_do_start() { static int pfs_do_start() {