From 31f7f20851b4efcf15033ae56c876dcd8840cc4e Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 26 Sep 2019 12:29:31 -0700 Subject: [PATCH] revert(symlink): keep stat argument I thought this wasn't used outside this package. Apparently, I didn't run grep from the right directory. It doesn't _hurt_ to keep this. --- linkfile.go | 6 ++++-- multipartfile.go | 2 +- serialfile.go | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/linkfile.go b/linkfile.go index 64e8762..5269986 100644 --- a/linkfile.go +++ b/linkfile.go @@ -1,17 +1,19 @@ package files import ( + "os" "strings" ) type Symlink struct { Target string + stat os.FileInfo reader strings.Reader } -func NewLinkFile(target string) File { - lf := &Symlink{Target: target} +func NewLinkFile(target string, stat os.FileInfo) File { + lf := &Symlink{Target: target, stat: stat} lf.reader.Reset(lf.Target) return lf } diff --git a/multipartfile.go b/multipartfile.go index 0351e19..d4593ad 100644 --- a/multipartfile.go +++ b/multipartfile.go @@ -99,7 +99,7 @@ func (w *multipartWalker) nextFile() (Node, error) { return nil, err } - return NewLinkFile(string(out)), nil + return NewLinkFile(string(out), nil), nil default: return &ReaderFile{ reader: part, diff --git a/serialfile.go b/serialfile.go index 8e4bf59..75a73b5 100644 --- a/serialfile.go +++ b/serialfile.go @@ -53,7 +53,7 @@ func NewSerialFile(path string, hidden bool, stat os.FileInfo) (Node, error) { if err != nil { return nil, err } - return NewLinkFile(target), nil + return NewLinkFile(target, stat), nil default: return nil, fmt.Errorf("unrecognized file type for %s: %s", path, mode.String()) }