forked from TrueCloudLab/restic
Remove OS-specific versions of fs.MkdirAll
Go has supported Windows paths correctly since 1.11, see https://github.com/golang/go/issues/10900 and the commit referenced there.
This commit is contained in:
parent
1557c58eef
commit
59b343a9bf
3 changed files with 8 additions and 65 deletions
|
@ -12,6 +12,14 @@ func Mkdir(name string, perm os.FileMode) error {
|
||||||
return os.Mkdir(fixpath(name), perm)
|
return os.Mkdir(fixpath(name), perm)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MkdirAll creates a directory named path, along with any necessary parents,
|
||||||
|
// and returns nil, or else returns an error. The permission bits perm are used
|
||||||
|
// for all directories that MkdirAll creates. If path is already a directory,
|
||||||
|
// MkdirAll does nothing and returns nil.
|
||||||
|
func MkdirAll(path string, perm os.FileMode) error {
|
||||||
|
return os.MkdirAll(fixpath(path), perm)
|
||||||
|
}
|
||||||
|
|
||||||
// Readlink returns the destination of the named symbolic link.
|
// Readlink returns the destination of the named symbolic link.
|
||||||
// If there is an error, it will be of type *PathError.
|
// If there is an error, it will be of type *PathError.
|
||||||
func Readlink(name string) (string, error) {
|
func Readlink(name string) (string, error) {
|
||||||
|
|
|
@ -14,14 +14,6 @@ func fixpath(name string) string {
|
||||||
return name
|
return name
|
||||||
}
|
}
|
||||||
|
|
||||||
// MkdirAll creates a directory named path, along with any necessary parents,
|
|
||||||
// and returns nil, or else returns an error. The permission bits perm are used
|
|
||||||
// for all directories that MkdirAll creates. If path is already a directory,
|
|
||||||
// MkdirAll does nothing and returns nil.
|
|
||||||
func MkdirAll(path string, perm os.FileMode) error {
|
|
||||||
return os.MkdirAll(fixpath(path), perm)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TempFile creates a temporary file which has already been deleted (on
|
// TempFile creates a temporary file which has already been deleted (on
|
||||||
// supported platforms)
|
// supported platforms)
|
||||||
func TempFile(dir, prefix string) (f *os.File, err error) {
|
func TempFile(dir, prefix string) (f *os.File, err error) {
|
||||||
|
|
|
@ -5,7 +5,6 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// fixpath returns an absolute path on windows, so restic can open long file
|
// fixpath returns an absolute path on windows, so restic can open long file
|
||||||
|
@ -31,62 +30,6 @@ func fixpath(name string) string {
|
||||||
return name
|
return name
|
||||||
}
|
}
|
||||||
|
|
||||||
// MkdirAll creates a directory named path, along with any necessary parents,
|
|
||||||
// and returns nil, or else returns an error. The permission bits perm are used
|
|
||||||
// for all directories that MkdirAll creates. If path is already a directory,
|
|
||||||
// MkdirAll does nothing and returns nil.
|
|
||||||
//
|
|
||||||
// Adapted from the stdlib MkdirAll, added test for volume name.
|
|
||||||
func MkdirAll(path string, perm os.FileMode) error {
|
|
||||||
// Fast path: if we can tell whether path is a directory or file, stop with success or error.
|
|
||||||
dir, err := os.Stat(path)
|
|
||||||
if err == nil {
|
|
||||||
if dir.IsDir() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return &os.PathError{
|
|
||||||
Op: "mkdir",
|
|
||||||
Path: path,
|
|
||||||
Err: syscall.ENOTDIR,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Slow path: make sure parent exists and then call Mkdir for path.
|
|
||||||
i := len(path)
|
|
||||||
for i > 0 && os.IsPathSeparator(path[i-1]) { // Skip trailing path separator.
|
|
||||||
i--
|
|
||||||
}
|
|
||||||
|
|
||||||
j := i
|
|
||||||
for j > 0 && !os.IsPathSeparator(path[j-1]) { // Scan backward over element.
|
|
||||||
j--
|
|
||||||
}
|
|
||||||
|
|
||||||
if j > 1 {
|
|
||||||
// Create parent
|
|
||||||
parent := path[0 : j-1]
|
|
||||||
if parent != filepath.VolumeName(parent) {
|
|
||||||
err = MkdirAll(parent, perm)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parent now exists; invoke Mkdir and use its result.
|
|
||||||
err = os.Mkdir(path, perm)
|
|
||||||
if err != nil {
|
|
||||||
// Handle arguments like "foo/." by
|
|
||||||
// double-checking that directory doesn't exist.
|
|
||||||
dir, err1 := os.Lstat(path)
|
|
||||||
if err1 == nil && dir.IsDir() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// TempFile creates a temporary file.
|
// TempFile creates a temporary file.
|
||||||
func TempFile(dir, prefix string) (f *os.File, err error) {
|
func TempFile(dir, prefix string) (f *os.File, err error) {
|
||||||
return ioutil.TempFile(dir, prefix)
|
return ioutil.TempFile(dir, prefix)
|
||||||
|
|
Loading…
Reference in a new issue