Skip to content

fsapfsmount: libfuse3 on macOS support / feature implementation #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FraSharp wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fsapfsmount: libfuse3 on macOS support / feature implementation #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f61654d
add macOS libfuse3 support
FraSharp Feb 27, 2026
ed8652c
Add tolerant mode support
FraSharp Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions fsapfstools/fsapfsmount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void usage_fprint(

fprintf( stream, "Usage: fsapfsmount [ -f file_system_index ] [ -o offset ] [ -p password ]\n"
" [ -r recovery_password ] [ -X extended_options ]\n"
" [ -hvV ] container mount_point\n\n" );
" [ -hRvV ] container mount_point\n\n" );

fprintf( stream, "\tcontainer: an Apple File System (APFS) container\n\n" );
fprintf( stream, "\tmount_point: the directory to serve as mount point\n\n" );
Expand All @@ -78,6 +78,7 @@ void usage_fprint(
fprintf( stream, "\t-o: specify the container offset in bytes\n" );
fprintf( stream, "\t-p: specify the password/passphrase\n" );
fprintf( stream, "\t-r: specify the recovery password/passphrase\n" );
fprintf( stream, "\t-R: enable recovery mode (tolerant for corrupted file system)\n" );
fprintf( stream, "\t-v: verbose output to stderr, while fsapfsmount will remain running in the\n"
"\t foreground\n" );
fprintf( stream, "\t-V: print version\n" );
Expand Down Expand Up @@ -148,6 +149,7 @@ int main( int argc, char * const argv[] )
system_integer_t option = 0;
int result = 0;
int verbose = 0;
int option_tolerant_mode = 0;

#if defined( HAVE_LIBFUSE ) || defined( HAVE_LIBFUSE3 ) || defined( HAVE_LIBOSXFUSE )
struct fuse_operations fsapfsmount_fuse_operations;
Expand Down Expand Up @@ -202,7 +204,7 @@ int main( int argc, char * const argv[] )
while( ( option = fsapfstools_getopt(
argc,
argv,
_SYSTEM_STRING( "f:ho:p:r:vVX:" ) ) ) != (system_integer_t) -1 )
_SYSTEM_STRING( "f:ho:p:r:RvVX:" ) ) ) != (system_integer_t) -1 )
{
switch( option )
{
Expand Down Expand Up @@ -239,15 +241,19 @@ int main( int argc, char * const argv[] )

break;

case (system_integer_t) 'r':
option_recovery_password = optarg;
case (system_integer_t) 'r':
option_recovery_password = optarg;

break;
break;

case (system_integer_t) 'R':
option_tolerant_mode = 1;
break;

case (system_integer_t) 'v':
verbose = 1;
case (system_integer_t) 'v':
verbose = 1;

break;
break;

case (system_integer_t) 'V':
fsapfstools_output_copyright_fprint(
Expand Down Expand Up @@ -305,6 +311,7 @@ int main( int argc, char * const argv[] )

goto on_error;
}
fsapfsmount_mount_handle->tolerant_mode = option_tolerant_mode;
if( option_file_system_index != NULL )
{
if( mount_handle_set_file_system_index(
Expand Down
4 changes: 4 additions & 0 deletions fsapfstools/mount_file_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ struct mount_file_system
/* The volume
*/
libfsapfs_volume_t *fsapfs_volume;

/* Tolerant mode (skip corrupt entries)
*/
uint8_t tolerant_mode;
};

int mount_file_system_initialize(
Expand Down
Loading