macos: look in alternate location for macfuse/osxfuse library #54
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
billziss-gh
reviewed
Feb 9, 2021
There was a problem hiding this comment.
@ncw thanks for the PR. Please see my remarks about nested comments below.
fuse/host_cgo.go
Outdated
| @@ -168,7 +168,9 @@ static void *cgofuse_init_fuse(void) | |||
|
|
|||
| void *h; | |||
| #if defined(__APPLE__) | |||
| h = dlopen("/usr/local/lib/libosxfuse.2.dylib", RTLD_NOW); | |||
| h = dlopen("/usr/local/lib/libfuse.2.dylib", RTLD_NOW); /* MacFUSE/OSXFuse >= v4 */ | |||
There was a problem hiding this comment.
Please change the comment to a single-line comment (i.e. from /* MacFUSE/OSXFuse >= v4 */ to // MacFUSE/OSXFuse >= v4). Otherwise Go is confused from the nested /* */ comments.
fuse/host_cgo.go
Outdated
| h = dlopen("/usr/local/lib/libosxfuse.2.dylib", RTLD_NOW); | ||
| h = dlopen("/usr/local/lib/libfuse.2.dylib", RTLD_NOW); /* MacFUSE/OSXFuse >= v4 */ | ||
| if (0 == h) | ||
| h = dlopen("/usr/local/lib/libosxfuse.2.dylib", RTLD_NOW); /* MacFUSE/OSXFuse < v4 */ |
There was a problem hiding this comment.
See my earlier remark.
With MacFUSE i.e. OSXFuse 4.0, the location of the loadable library has changed to `/usr/local/lib/libfuse.2.dylib` instead of `/usr/local/lib/libosxfuse.2.dylib`. The older path is still present for backwards compatibility for the time being. This patch looks in the newer location first, then in the older location if that fails. Release Notes: https://github.com/osxfuse/osxfuse/releases/tag/macfuse-4.0.0 Fixes winfsp#52
|
I've fixed the comments 😊 I must have been having a regression back to C89! |
|
Thank you. I can confirm that this builds and runs properly on my own Macs, both with older OSXFUSE and newer macFUSE 4. |
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.
With MacFUSE i.e. OSXFuse 4.0, the location of the loadable library
has changed to
/usr/local/lib/libfuse.2.dylibinstead of/usr/local/lib/libosxfuse.2.dylib. The older path is still presentfor backwards compatibility for the time being.
This patch looks in the newer location first, then in the older
location if that fails.
Release Notes: https://github.com/osxfuse/osxfuse/releases/tag/macfuse-4.0.0
Fixes #52