perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/scanner: Copy execute bits from previous version on Windows (fixes #4969) (#4970)

Browse Source
This commit is contained in:
Audrius Butkevicius 2018-05-29 07:01:23 +01:00 committed by Jakob Borg
parent a83176c77a
commit d60f0e734c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/scanner/walk.go
View File

@ -321,13 +321,22 @@ func (w *walker) handleItem(ctx context.Context, path string, fchan, dchan chan
} }
func (w *walker) walkRegular(ctx context.Context, relPath string, info fs.FileInfo, fchan chan protocol.FileInfo) error { func (w *walker) walkRegular(ctx context.Context, relPath string, info fs.FileInfo, fchan chan protocol.FileInfo) error {
curMode := uint32(info.Mode()) curFile, hasCurFile := w.CurrentFiler.CurrentFile(relPath)
if runtime.GOOS == "windows" && osutil.IsWindowsExecutable(relPath) {
curMode |= 0111 newMode := uint32(info.Mode())
if runtime.GOOS == "windows" {
if osutil.IsWindowsExecutable(relPath) {
// Set executable bits on files with executable extenions (.exe,
// .bat, etc).
newMode |= 0111
} else if hasCurFile {
// If we have an existing index entry, copy the executable bits
// from there.
newMode |= (curFile.Permissions & 0111)
}
} }
blockSize := protocol.MinBlockSize blockSize := protocol.MinBlockSize
curFile, hasCurFile := w.CurrentFiler.CurrentFile(relPath)
if w.UseLargeBlocks { if w.UseLargeBlocks {
blockSize = protocol.BlockSize(info.Size()) blockSize = protocol.BlockSize(info.Size())
@ -351,7 +360,7 @@ func (w *walker) walkRegular(ctx context.Context, relPath string, info fs.FileIn
Name: relPath, Name: relPath,
Type: protocol.FileInfoTypeFile, Type: protocol.FileInfoTypeFile,
Version: curFile.Version.Update(w.ShortID), Version: curFile.Version.Update(w.ShortID),
Permissions: curMode & uint32(maskModePerm), Permissions: newMode & uint32(maskModePerm),
NoPermissions: w.IgnorePerms, NoPermissions: w.IgnorePerms,
ModifiedS: info.ModTime().Unix(), ModifiedS: info.ModTime().Unix(),
ModifiedNs: int32(info.ModTime().Nanosecond()), ModifiedNs: int32(info.ModTime().Nanosecond()),