[pull] master from veracrypt:master#196
Merged
Merged
Conversation
…ng scanning (#1776) The hdiutil `-plist` output used for mount/dismount device discovery (MountAuxVolumeImage and UpdateMountedVolumeInfo) was parsed with a hand-rolled string scanner that assumed the value always follows the requested key and that <key>/<string> pairs appear in a fixed order. Replace it with the CoreFoundation property-list API (CFPropertyListCreateWithData + dictionary/array navigation), which is correct by construction and robust to hdiutil output ordering/variation. An RAII helper (CFHolder) ensures CFRelease on every path. Behavior is preserved: prefer the system-entity that carries a mount-point, otherwise fall back to the first dev-entry, and match disk images by normalized image-path. CoreFoundation is already linked on macOS (via Cocoa), so no build changes are needed. Verified end-to-end on Apple Silicon: mounting parses `hdiutil attach` output and dismount parses `hdiutil info` output correctly. Co-authored-by: Damian Rickard <damian@rickard.us>
Install staged /usr child directories by merging their contents into existing destination directories instead of replacing them. This preserves /usr/sbin symlinks to bin on merged-/usr distributions while keeping traditional layouts working. Fixes issue: #1764
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )