Use FHS/XDG paths for UserDefaults on Linux & BSD-y OSes #1399
Conversation
|
@swift-ci Please test. |
| @@ -1198,7 +1198,7 @@ static CFStringRef _CFXDGCreateHome(void) { | |||
| } | |||
|
|
|||
| /// a single base directory relative to which user-specific data files should be written. This directory is defined by the environment variable $XDG_DATA_HOME. | |||
| CF_SWIFT_EXPORT | |||
There was a problem hiding this comment.
This should still only be exported on non-Darwin platforms. We may need another version of this CF_EXPORT macro.
|
|
||
| #include <assert.h> | ||
|
|
||
| CONST_STRING_DECL(_kCFKnownLocationUserAny, " == _kCFKnownLocationUserAny"); |
There was a problem hiding this comment.
Hm, the == at the start is something unusual. In most cases the string is equal to the key name.
There was a problem hiding this comment.
Yeah — the idea here was to make sure it couldn't be a valid username. Since we're switching to an enum, this problem goes away.
| - Current: $HOME/Library/Preferences | ||
| */ | ||
|
|
||
| if (user == _kCFKnownLocationUserAny) { |
There was a problem hiding this comment.
If we're just going to do an == check, perhaps we should just declare an enum?
There was a problem hiding this comment.
Yeah, that makes sense. It'll be the enum plus a NULLable username string argument.
| See CFKnownLocations.c for a summary of what paths are returned. | ||
| */ | ||
|
|
||
| extern CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUser user); |
There was a problem hiding this comment.
We'll need to make sure this is only exported on non-Darwin platforms.
| @@ -327,8 +327,6 @@ CF_EXPORT _Nullable CFErrorRef CFReadStreamCopyError(CFReadStreamRef stream); | |||
|
|
|||
| CF_EXPORT _Nullable CFErrorRef CFWriteStreamCopyError(CFWriteStreamRef stream); | |||
|
|
|||
| CF_SWIFT_EXPORT Boolean _CFBundleSupportsFHSBundles(void); | |||
There was a problem hiding this comment.
This removal is a merge issue and incorrect.
|
@swift-ci Please test. |
|
I'm going to have a proposal for CF_SWIFT_EXPORT as a separate patch, and then rebase this one. |
|
Out of curiosity, why |
|
|
|
@swift-ci Please test. |
|
@swift-ci Please test and merge. |
On FHS/XDG systems, the paths for UserDefaults are now:
/usr/local/etcfor AnyUser preferences (replaces/Library/Preferences)$XDG_CONFIG_DIRfor CurrentUser preferences (replaces$HOME/Library/Preferences)(
$XDG_CONFIG_DIRis typically, and defaults to,$HOME/.config/.)