KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Always use forward slashes in file names

Browse source
This commit is contained in:
Alexander Neumann 2016-08-11 19:41:47 +02:00
parent f6c2787d80
commit fa4570bde8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/restic/backend/sftp/sftp.go
View file

@ -9,7 +9,6 @@ import (
"os" "os"
"os/exec" "os/exec"
"path" "path"
"path/filepath"
"strings" "strings"
"restic/backend" "restic/backend"
@ -80,7 +79,8 @@ func paths(dir string) []string {
// Open opens an sftp backend. When the command is started via // Open opens an sftp backend. When the command is started via
// exec.Command, it is expected to speak sftp on stdin/stdout. The backend // exec.Command, it is expected to speak sftp on stdin/stdout. The backend
// is expected at the given path. // is expected at the given path. `dir` must be delimited by forward slashes
// ("/"), which is required by sftp.
func Open(dir string, program string, args ...string) (*SFTP, error) { func Open(dir string, program string, args ...string) (*SFTP, error) {
sftp, err := startClient(program, args...) sftp, err := startClient(program, args...)
if err != nil { if err != nil {
@ -120,7 +120,8 @@ func OpenWithConfig(cfg Config) (*SFTP, error) {
} }
// Create creates all the necessary files and directories for a new sftp // Create creates all the necessary files and directories for a new sftp
// backend at dir. Afterwards a new config blob should be created. // backend at dir. Afterwards a new config blob should be created. `dir` must
// be delimited by forward slashes ("/"), which is required by sftp.
func Create(dir string, program string, args ...string) (*SFTP, error) { func Create(dir string, program string, args ...string) (*SFTP, error) {
sftp, err := startClient(program, args...) sftp, err := startClient(program, args...)
if err != nil { if err != nil {
@ -201,7 +202,7 @@ func (r *SFTP) mkdirAll(dir string, mode os.FileMode) error {
} }
// create parent directories // create parent directories
errMkdirAll := r.mkdirAll(filepath.Dir(dir), backend.Modes.Dir) errMkdirAll := r.mkdirAll(path.Dir(dir), backend.Modes.Dir)
// create directory // create directory
errMkdir := r.c.Mkdir(dir) errMkdir := r.c.Mkdir(dir)
@ -227,7 +228,7 @@ func (r *SFTP) renameFile(oldname string, t backend.Type, name string) error {
// create directories if necessary // create directories if necessary
if t == backend.Data { if t == backend.Data {
err := r.mkdirAll(filepath.Dir(filename), backend.Modes.Dir) err := r.mkdirAll(path.Dir(filename), backend.Modes.Dir)
if err != nil { if err != nil {
return err return err
} }
@ -342,7 +343,7 @@ func (r *SFTP) Save(h backend.Handle, p []byte) (err error) {
err = r.renameFile(filename, h.Type, h.Name) err = r.renameFile(filename, h.Type, h.Name)
debug.Log("sftp.Save", "save %v: rename %v: %v", debug.Log("sftp.Save", "save %v: rename %v: %v",
h, filepath.Base(filename), err) h, path.Base(filename), err)
if err != nil { if err != nil {
return fmt.Errorf("sftp: renameFile: %v", err) return fmt.Errorf("sftp: renameFile: %v", err)
} }