lib/fs: Handle deduplicated files on NTFS (fixes #1845) #4622
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
lib/fs/fsfileinfo_windows.go
Outdated
|
|
||
| func (e fsFileInfo) Mode() FileMode { | ||
| m := e.FileInfo.Mode() | ||
| if e.Size() > 0 { |
There was a problem hiding this comment.
Checking if symlink bit it set first is cheaper, only then check for size.
lib/fs/fsfileinfo_windows.go
Outdated
| if e.Size() > 0 { | ||
| return false | ||
| } | ||
| return e.FileInfo.Mode()&os.ModeSymlink == os.ModeSymlink |
There was a problem hiding this comment.
Do you even need this? Can't we just call e.Mode() instead of e.FileInfo.Mode()?
lib/fs/fsfileinfo_windows.go
Outdated
| if e.Size() > 0 { | ||
| return true | ||
| } | ||
| return e.FileInfo.Mode().IsRegular() |
There was a problem hiding this comment.
Do you even need this? Can't we just call e.Mode() instead of e.FileInfo.Mode()?
lib/fs/fsfileinfo_windows.go
Outdated
|
|
||
| func (e fsFileInfo) IsSymlink() bool { | ||
| // N.B. this uses *our* Mode() which appropriately masks this bit. | ||
| return e.Mode()&FileMode(os.ModeSymlink) != 0 |
There was a problem hiding this comment.
Just ModeSymlink, which is already defined in fs.go.
There was a problem hiding this comment.
It actually isn't but maybe it should be
|
There, now I actually read your comments Audrius. |
lib/fs/fsfileinfo_windows.go
Outdated
| m := e.FileInfo.Mode() &^ os.ModeSymlink | ||
| return m.IsRegular() | ||
| } | ||
| return e.FileInfo.Mode().IsRegular() |
There was a problem hiding this comment.
Perhaps:
m := e.FileInfo.Mode()
if m&.ModeSymlink && .. .{
m ^= ModeSymlink
}
return m.IsRegular()
calmh
changed the title
These files always have the symlink bit set, because they are reparse points. Nonetheless they are not symlinks, and Lstat reports a size for them. We use this fact to disambiguate, and hope fervently that nothing else matches this description so it comes back to bite us...
calmh
changed the title
|
Good to go |
|
@st-review merge |
st-review
pushed a commit
that referenced
this pull request
Dec 29, 2017
These files always have the symlink bit set, because they are reparse points. Nonetheless they are not symlinks, and Lstat reports a size for them. We use this fact to disambiguate, and hope fervently that nothing else matches this description so it comes back to bite us... GitHub-Pull-Request: #4622
st-review
added
the
pr-merged
st-review
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
These files always have the symlink bit set, because they are reparse points. Nonetheless they are not symlinks, and Lstat reports a size for them. We use this fact to disambiguate, and hope fervently that nothing else matches this description so it comes back to bite us...
Testing
@niphlod tested: