mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor fixes and linter suggestions

This commit is contained in:
DRON-666 2020-12-19 02:04:17 +03:00
parent da9053b184
commit 33adb58817
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/dump/tar.go
View File

@ -26,6 +26,7 @@ func WriteTar(ctx context.Context, repo restic.Repository, tree *restic.Tree, ro
err := writeDump(ctx, repo, tree, rootPath, dmp, dst) err := writeDump(ctx, repo, tree, rootPath, dmp, dst)
if err != nil { if err != nil {
dmp.w.Close() dmp.w.Close()
return err return err
} }
@ -36,9 +37,9 @@ func WriteTar(ctx context.Context, repo restic.Repository, tree *restic.Tree, ro
const ( const (
// Mode constants from the USTAR spec: // Mode constants from the USTAR spec:
// See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13_06 // See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13_06
c_ISUID = 04000 // Set uid cISUID = 0o4000 // Set uid
c_ISGID = 02000 // Set gid cISGID = 0o2000 // Set gid
c_ISVTX = 01000 // Save text (sticky bit) cISVTX = 0o1000 // Save text (sticky bit)
) )
func (dmp tarDumper) dumpNode(ctx context.Context, node *restic.Node, repo restic.Repository) error { func (dmp tarDumper) dumpNode(ctx context.Context, node *restic.Node, repo restic.Repository) error {
@ -50,7 +51,7 @@ func (dmp tarDumper) dumpNode(ctx context.Context, node *restic.Node, repo resti
header := &tar.Header{ header := &tar.Header{
Name: filepath.ToSlash(relPath), Name: filepath.ToSlash(relPath),
Size: int64(node.Size), Size: int64(node.Size),
Mode: int64(node.Mode.Perm()), // c_IS* constants are added later Mode: int64(node.Mode.Perm()), // cIS* constants are added later
Uid: int(node.UID), Uid: int(node.UID),
Gid: int(node.GID), Gid: int(node.GID),
Uname: node.User, Uname: node.User,
@ -63,13 +64,13 @@ func (dmp tarDumper) dumpNode(ctx context.Context, node *restic.Node, repo resti
// adapted from archive/tar.FileInfoHeader // adapted from archive/tar.FileInfoHeader
if node.Mode&os.ModeSetuid != 0 { if node.Mode&os.ModeSetuid != 0 {
header.Mode |= c_ISUID header.Mode |= cISUID
} }
if node.Mode&os.ModeSetgid != 0 { if node.Mode&os.ModeSetgid != 0 {
header.Mode |= c_ISGID header.Mode |= cISGID
} }
if node.Mode&os.ModeSticky != 0 { if node.Mode&os.ModeSticky != 0 {
header.Mode |= c_ISVTX header.Mode |= cISVTX
} }
if IsFile(node) { if IsFile(node) {
@ -89,7 +90,7 @@ func (dmp tarDumper) dumpNode(ctx context.Context, node *restic.Node, repo resti
err = dmp.w.WriteHeader(header) err = dmp.w.WriteHeader(header)
if err != nil { if err != nil {
return errors.Wrap(err, "TarHeader ") return errors.Wrap(err, "TarHeader")
} }
return GetNodeData(ctx, dmp.w, repo, node) return GetNodeData(ctx, dmp.w, repo, node)

5
internal/dump/zip.go
View File

@ -15,7 +15,7 @@ type zipDumper struct {
} }
// Statically ensure that zipDumper implements dumper. // Statically ensure that zipDumper implements dumper.
var _ dumper = tarDumper{} var _ dumper = zipDumper{}
// WriteZip will write the contents of the given tree, encoded as a zip to the given destination. // WriteZip will write the contents of the given tree, encoded as a zip to the given destination.
func WriteZip(ctx context.Context, repo restic.Repository, tree *restic.Tree, rootPath string, dst io.Writer) error { func WriteZip(ctx context.Context, repo restic.Repository, tree *restic.Tree, rootPath string, dst io.Writer) error {
@ -24,6 +24,7 @@ func WriteZip(ctx context.Context, repo restic.Repository, tree *restic.Tree, ro
err := writeDump(ctx, repo, tree, rootPath, dmp, dst) err := writeDump(ctx, repo, tree, rootPath, dmp, dst)
if err != nil { if err != nil {
dmp.w.Close() dmp.w.Close()
return err return err
} }
@ -49,7 +50,7 @@ func (dmp zipDumper) dumpNode(ctx context.Context, node *restic.Node, repo resti
w, err := dmp.w.CreateHeader(header) w, err := dmp.w.CreateHeader(header)
if err != nil { if err != nil {
return errors.Wrap(err, "ZipHeader ") return errors.Wrap(err, "ZipHeader")
} }
if IsLink(node) { if IsLink(node) {