Windows: implement getCorrectCasing #9435
Closed
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
Implement getCorrectCasing: a function that normalizes a path and returns the case-correct version of it. See bazelbuild#8799
laszlocsomor
changed the title
meisterT
reviewed
Sep 25, 2019
| @@ -228,4 +230,14 @@ public static boolean deletePath(String path) throws IOException { | |||
| throw new IOException(String.format("Cannot delete path '%s': %s", path, error[0])); | |||
| } | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Please a comment here that explains what "correct" refers to.
src/main/native/windows/file.cc
Outdated
| @@ -781,5 +781,46 @@ bool GetCwd(std::wstring* result, DWORD* err_code) { | |||
| } | |||
| } | |||
|
|
|||
| std::wstring GetCorrectCasing(const std::wstring& abs_path, bool with_unc) { | |||
There was a problem hiding this comment.
this looks like an absolute path is required - I don't see this requirement on the Java side. Do I miss something?
There was a problem hiding this comment.
currently the only caller passes with_unc=false, right? Do you have plans to change that?
| wcscpy(result.get(), L"\\\\?\\"); | ||
| wcscpy(result.get() + 4, path.c_str()); | ||
| result[4] = towupper(result[4]); | ||
| wchar_t* start = result.get() + 7; |
There was a problem hiding this comment.
There is a lot of implicit knowledge in this code which makes it hard to read, e.g. where does the 7 come from?
There was a problem hiding this comment.
is this from UNC (if so make it conditional)?
There was a problem hiding this comment.
Added comment.
|
Thanks for the quick and thorough review! |
meisterT
approved these changes
Sep 25, 2019
bazel-io
pushed a commit
that referenced
this pull request
Oct 31, 2019
*** Reason for rollback *** We must implement path case fixing on top of Skyframe (by requesting DirectoryListingValue), rather than as a JNI method. That way clients get invalidated when a path is renamed such that only the casing changes. *** Original change description *** Windows: implement getCorrectCasing Implement getCorrectCasing: a function that normalizes a path and returns the case-correct version of it. See #8799 Closes #9435. PiperOrigin-RevId: 277688249
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.
Implement getCorrectCasing: a function that
normalizes a path and returns the case-correct
version of it.
See #8799