mirror of
https://github.com/golang/go
synced 2024-11-17 19:25:13 -07:00
476395cb3e
It turns out that the relative-path support never worked in the first place. It had been masked by the fact that we ~never invoke overlayDir with an absolute path, which caused filepath.Rel to always return an error, and overlayDir to always fall back to absolute paths. Since the absolute paths seem to be working fine (and are simpler), let's stick with those. As far as I can recall, the relative paths were only a space optimization anyway. Updates #28387 Updates #30316 Change-Id: Ie8cd28f3c41ca6497ace2799f4193d7f5dde7a37 Reviewed-on: https://go-review.googlesource.com/c/go/+/208481 Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Jay Conrod <jayconrod@google.com>
79 lines
1.8 KiB
Go
79 lines
1.8 KiB
Go
// Copyright 2019 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package stdio_test
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
// overlayDir makes a minimal-overhead copy of srcRoot in which new files may be added.
|
|
//
|
|
// TODO: Once we no longer need to support the misc module in GOPATH mode,
|
|
// factor this function out into a package to reduce duplication.
|
|
func overlayDir(dstRoot, srcRoot string) error {
|
|
dstRoot = filepath.Clean(dstRoot)
|
|
if err := os.MkdirAll(dstRoot, 0777); err != nil {
|
|
return err
|
|
}
|
|
|
|
srcRoot, err := filepath.Abs(srcRoot)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return filepath.Walk(srcRoot, func(srcPath string, info os.FileInfo, err error) error {
|
|
if err != nil || srcPath == srcRoot {
|
|
return err
|
|
}
|
|
|
|
suffix := strings.TrimPrefix(srcPath, srcRoot)
|
|
for len(suffix) > 0 && suffix[0] == filepath.Separator {
|
|
suffix = suffix[1:]
|
|
}
|
|
dstPath := filepath.Join(dstRoot, suffix)
|
|
|
|
perm := info.Mode() & os.ModePerm
|
|
if info.Mode()&os.ModeSymlink != 0 {
|
|
info, err = os.Stat(srcPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
perm = info.Mode() & os.ModePerm
|
|
}
|
|
|
|
// Always copy directories (don't symlink them).
|
|
// If we add a file in the overlay, we don't want to add it in the original.
|
|
if info.IsDir() {
|
|
return os.MkdirAll(dstPath, perm|0200)
|
|
}
|
|
|
|
// If the OS supports symlinks, use them instead of copying bytes.
|
|
if err := os.Symlink(srcPath, dstPath); err == nil {
|
|
return nil
|
|
}
|
|
|
|
// Otherwise, copy the bytes.
|
|
src, err := os.Open(srcPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer src.Close()
|
|
|
|
dst, err := os.OpenFile(dstPath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, perm)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
_, err = io.Copy(dst, src)
|
|
if closeErr := dst.Close(); err == nil {
|
|
err = closeErr
|
|
}
|
|
return err
|
|
})
|
|
}
|