From ee549133ba9327c373798ee3f4dd49292216a3ca Mon Sep 17 00:00:00 2001 From: Tom Sullivan Date: Mon, 5 Jul 2021 19:05:18 +1000 Subject: [PATCH] Rename `apfsutil` target to `apfs-util` To maintain consistency with the other targets, and to allow building on case-insenstive file systems (an unfortunate default under macOS), rename the `apfsutil` target to `apfs-util` --- CMakeLists.txt | 6 +++--- README.md | 6 +++--- apfsfuse/ApfsFuse.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ad571e..63a2ac2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,9 +129,9 @@ target_compile_definitions(apfs-fuse PRIVATE USE_FUSE2) endif() endif() -add_executable(apfsutil ApfsUtil/ApfsUtil.cpp) -target_link_libraries(apfsutil apfs) +add_executable(apfs-util ApfsUtil/ApfsUtil.cpp) +target_link_libraries(apfs-util apfs) include(GNUInstallDirs) install(TARGETS apfs-fuse RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -install(TARGETS apfsutil RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") +install(TARGETS apfs-util RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") diff --git a/README.md b/README.md index 84bf994..4186562 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ In addition to the mount options supported by fuse, the following mount options * blksize=n: Set the physical block size (default: 512 bytes). * pass=...: Specify volume passphrase (same as -r). * xid=...: Try to mount older XID. May be useful if the container is corrupt. -* snap=...: Mount snapshot with given XID. Use apfsutil to display snapshot ids. +* snap=...: Mount snapshot with given XID. Use apfs-util to display snapshot ids. The blksize parameter is required for proper partition table parsing on some newer macs. However the current driver should be able to detect the block size automatically. @@ -206,9 +206,9 @@ apfs-dump This tool was the one I originally used for reverse engineering. It will scan the whole volume for clusters having correct checksums (and thus being part of some management structure), and then it will try to dump them. This will take a very long time to run on big volumes, and create huge log files. So using the quick version will be much faster. -#### apfsutil +#### apfs-util ``` -apfsutil +apfs-util ``` This is a new tool that just displays some information from a container. For now, it lists the volumes a container contains, and snapshots if there are some. This tool might be extended in the future. diff --git a/apfsfuse/ApfsFuse.cpp b/apfsfuse/ApfsFuse.cpp index 372fd3c..c2bb4a3 100644 --- a/apfsfuse/ApfsFuse.cpp +++ b/apfsfuse/ApfsFuse.cpp @@ -650,7 +650,7 @@ void usage(const char *name) std::cout << " to be parsed and the sector size is not 512 bytes." << std::endl; std::cout << "pass=... : Specify volume passphrase (same as -r)." << std::endl; std::cout << "xid=N : Mount specific xid." << std::endl; - std::cout << "snap=N : Mount snapshot with given id. Use apfsutil for getting the ids." << std::endl; + std::cout << "snap=N : Mount snapshot with given id. Use apfs-util for getting the ids." << std::endl; std::cout << std::endl; }