amorfo77/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2026-04-18 10:58:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #569 from restic/fix-568

Browse Source 
Use the platform-independent function for joining
This commit is contained in:
Alexander Neumann
2016-08-19 17:53:09 +02:00
parent 812cb0ba77 1fe8deeb6e
commit 2a2fb74ba8
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/restic/backend/sftp/sftp.go
View File

@@ -8,13 +8,14 @@ import (
"log"
"os"
"os/exec"
"path/filepath"
"path"
"strings"
"restic/backend"
"restic/debug"
"github.com/juju/errors"
"github.com/pkg/sftp"
"restic/backend"
"restic/debug"
)
const (
@@ -78,7 +79,8 @@ func paths(dir string) []string {
// Open opens an sftp backend. When the command is started via
// 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) {
sftp, err := startClient(program, args...)
if err != nil {
@@ -118,7 +120,8 @@ func OpenWithConfig(cfg Config) (*SFTP, error) {
}
// 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) {
sftp, err := startClient(program, args...)
if err != nil {
@@ -199,7 +202,7 @@ func (r *SFTP) mkdirAll(dir string, mode os.FileMode) error {
}
// create parent directories
errMkdirAll := r.mkdirAll(filepath.Dir(dir), backend.Modes.Dir)
errMkdirAll := r.mkdirAll(path.Dir(dir), backend.Modes.Dir)
// create directory
errMkdir := r.c.Mkdir(dir)
@@ -225,7 +228,7 @@ func (r *SFTP) renameFile(oldname string, t backend.Type, name string) error {
// create directories if necessary
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 {
return err
}
@@ -250,9 +253,10 @@ func (r *SFTP) renameFile(oldname string, t backend.Type, name string) error {
return r.c.Chmod(filename, fi.Mode()&os.FileMode(^uint32(0222)))
}
// Join joins the given paths and cleans them afterwards.
// Join joins the given paths and cleans them afterwards. This always uses
// forward slashes, which is required by sftp.
func Join(parts ...string) string {
return filepath.Clean(strings.Join(parts, "/"))
return path.Clean(path.Join(parts...))
}
// Construct path for given backend.Type and name.
@@ -339,7 +343,7 @@ func (r *SFTP) Save(h backend.Handle, p []byte) (err error) {
err = r.renameFile(filename, h.Type, h.Name)
debug.Log("sftp.Save", "save %v: rename %v: %v",
h, filepath.Base(filename), err)
h, path.Base(filename), err)
if err != nil {
return fmt.Errorf("sftp: renameFile: %v", err)
}