URL(filePath:) should not treat "~" as absolute #961
Merged
Conversation
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
|
@swift-ci please test |
jrflat
commented
Oct 3, 2024
| @@ -1688,41 +1688,47 @@ extension URL { | |||
| /// Checks if a file path is absolute and standardizes the inputted file path on Windows | |||
| /// Assumes the path only contains `/` as the path separator | |||
| internal static func isAbsolute(standardizing filePath: inout String) -> Bool { | |||
| if filePath.utf8.first == ._slash { | |||
| return true | |||
| } | |||
| #if os(Windows) | |||
There was a problem hiding this comment.
Refactored the Windows part and moved up the .first == ._slash check, which is valid for Windows and non-Windows platforms.
jmschonfeld
approved these changes
Oct 3, 2024
jrflat
added a commit
to jrflat/swift-foundation
that referenced
this pull request
Oct 8, 2024
jrflat
added a commit
to jrflat/swift-foundation
that referenced
this pull request
Oct 14, 2024
jrflat
added a commit
that referenced
this pull request
Oct 14, 2024
* (133878310) URL.fileSystemPath should drop all trailing slashes (#852) * (133882014) URL(filePath: path, directoryHint: .notDirectory) should strip trailing slashes (#867) * (137129292) URL(filePath:) should not treat "~" as absolute (#961) * (137068266) URL.fileSystemPath should strip leading slash for Windows drive letters (#964) * (137287143) URL path extension APIs should strip trailing slashes (#965)
jrflat
added a commit
that referenced
this pull request
Oct 14, 2024
* (133878310) URL.fileSystemPath should drop all trailing slashes (#852) * (133882014) URL(filePath: path, directoryHint: .notDirectory) should strip trailing slashes (#867) * (137129292) URL(filePath:) should not treat "~" as absolute (#961) * (137068266) URL.fileSystemPath should strip leading slash for Windows drive letters (#964) * (137287143) URL path extension APIs should strip trailing slashes (#965)
cthielen
pushed a commit
to cthielen/swift-foundation
that referenced
this pull request
Nov 8, 2024
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.
Paths beginning with
~should not be treated as absolute forURL(filePath:). This is because when constructing aURLComponentsfor a file path we consider absolute, we do:This would create the string like
file://~/. However,URLComponentsrejects this string because the~is ambiguous--it looks like a host. This can leadcomponents.url!to crash when force-unwrapping.This PR changes the
isAbsolutecheck to only consider/paths absolute. If the path starts with~, we will try to expand the tilde, then ensure that the result is absolute.