Fixes for copyfile(), *statx() and TargetConditionals #108
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This creates a directory under /tmp which tests can use to write any needed files, passing its location to test builds. TESTED: Directory is created and removed as expected.
This reworks the arrangement of the copyfile-related headers for 10.4, where the SDK provided none. In the new arrangement: 1) The added header now represents what a 10.4 copyfile.h would have looked like if it existed. 2) The additions for 10.4->10.5 copyfile are now in the wrapper header. 3) A new pair of feature flags is added for the 10.4 case. TESTED: Library still builds. Test builds, and passes or fails as before.
After applying many fixes to the old copyfile wrapper, it was still hopeless on 10.4 due to a fatal internal bug in Apple's code. This change throws all that out and imports the entire copyfile implementation from 10.6. This should provide the full 10.6 copyfile on 10.5, and a mostly full implementation on 10.4, after additional 10.4 fixes in the next commit. This retains the feature of Apple's copyfile that allows it to be built as a standalone program for easier testing. TESTED: Builds and passes the test on 10.5+. Doesn't yet build on 10.4 (fixed in subsequent commit).
Since the O_SYMLINK definition is missing from the 10.4 fcntl.h, we provide a default here. It's the correct value, but whether or not it actually works correctly in 10.4 is unknown. Since 10.4 lacks quarantine support, we provide dummy macros for the quarantine definitions referenced here. With these changes, 10.4 should now have the full 10.6 copyfile, except that quarantine-related operations almost certainly don't work, and special handling of symlinks may not work. TESTED: Builds and passes the test on all OS versions, including 10.4.
This is a simple test of copyfile(), along with a couple of copyfile_state_set()/copyfile_state_get() options. Includes access to copyfile()'s secret debug mode. TESTED: Passes on all platforms, except 10.4 Rosetta.
The copyfile_state alloc/free functions were renamed between 10.4 and 10.5. The 10.4 libSystem provides them under their old names, but since the structure has changed between 10.4 and 10.6, using the old functions would cause problems. This provides wrappers for the new functions under the old names (in 10.4 builds), so that any use of the old names will properly use the new versions. TESTED: Builds, and new test for wrappers passes.
This verifies that the 10.4 alloc/free functions are actually using the new versions, by checking the allocated size. TESTED: Passes on all platforms normally. Fails as expected on 10.4 with wrappers disabled.
This is taken from: https://github.com/apple-oss-distributions/copyfile/blob/copyfile-66.1/copyfile.3 Almost verbatim, but with additions to indicate that QUARANTINE operations are unavailable on 10.4, and that ACL copying doesn't work in 10.4 Rosetta. Adds manpage directory creation to Makefile, including missing case for the previously added 'which' manpage. TESTED: Manpages are installed as appropriate by the relevant targets.
Adds copyfile debugging targets to src/Makefile. Fixes src/Makefile to honor CC. Adds filesec_internal.h for debug builds of copyfile.
Due to a bug in fstatx_np() in 10.4 Rosetta, COPYFILE_ACL doesn't work. In that case, we disable that particular operation to avoid a test failure. The remaining three COPYFILE_ALL operations are still tested. There's also a bug in 10.4 Rosetta's chmodx_np(), which causes an internal error when attempting to ensure that the destination is writable, but that doesn't cause failures in the test case. TESTED: Passes on all platforms, including 10.4 Rosetta.
TESTED: New tests for these functions build without prototype warnings.
TESTED: Tests pass on all 10.5+ platforms. Tests fail on 10.4 without new addition, and pass with it.
This expands the 10.4 64-bit inode support to include the *statx_np functions. TESTED: Updated test_stat passes on all platforms with this change.
The fstatx_np() and fstatx64_np() functions don't work in 10.4 Rosetta. This excludes their tests in that case. TESTED: Now passes on all platforms, including 10.4 Rosetta.
This replaces the old cherry-picked list with a more complete version taken from the macOS 15 SDK. In the process, it fixes a conflict with a hack in the AvailabilityMacros.h wrapper. Closes: https://trac.macports.org/ticket/70824 TESTED: Passes updated test on all platforms, with all applicable SDKs.
TESTED: Passes on all platforms, with all applicable SDKs.
|
@mascguy The |
I was a bit worried at first, given the nearly 5,000 lines of changes. But thankfully some of that is for the man pages, which makes this a little less grueling to review. Will try to finish the review today. |
mascguy
approved these changes
Jan 11, 2025
I suppose I should have warned you about that, given that a large part is the wholesale import of Apple's
I see you did. Thanks. I'll create and test a -devel update today. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tested, both from repo and as a temporary Portfile, on: