opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-10-25 02:16:56 +08:00
Code Issues Projects Releases Wiki Activity

serialfile: Explicit err on unrecognized file type

Browse Source 
So that ipfs add on daemon no longer blocks

License: MIT
Signed-off-by: rht <rhtbot@gmail.com>
This commit is contained in:
rht
2015-09-03 17:18:28 +07:00
parent 93e9f8418b
commit ddc8dff736
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
commands/files/serialfile.go
View File

@ -1,6 +1,7 @@
package files
import (
"fmt"
"io"
"os"
fp "path/filepath"
@ -26,13 +27,18 @@ type serialFile struct {
}
func NewSerialFile(name, path string, stat os.FileInfo) (File, error) {
if stat.Mode()&os.ModeSymlink != 0 {
switch mode := stat.Mode(); {
case mode.IsDir() || mode.IsRegular():
break
case mode&os.ModeSymlink != 0:
target, err := os.Readlink(path)
if err != nil {
return nil, err
}
return NewLinkFile("", path, target, stat), nil
default:
return nil, fmt.Errorf("Unrecognized file type for %s: %s", stat.Name(), mode.String())
}
file, err := os.Open(path)
@ -97,13 +103,18 @@ func (f *serialFile) NextFile() (File, error) {
return nil, err
}
if st.Mode()&os.ModeSymlink != 0 {
switch mode := st.Mode(); {
case mode.IsDir() || mode.IsRegular():
break
case mode&os.ModeSymlink != 0:
f.current = nil
target, err := os.Readlink(filePath)
if err != nil {
return nil, err
}
return NewLinkFile(fileName, filePath, target, st), nil
default:
return nil, fmt.Errorf("Unrecognized file type for %s: %s", st.Name(), mode.String())
}
file, err := os.Open(filePath)