aboutsummaryrefslogtreecommitdiff
path: root/weed/shell
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-02-25 11:13:06 -0800
committerChris Lu <chris.lu@gmail.com>2020-02-25 11:13:06 -0800
commit7d10fdf73720fb3234cd5cacfaf10fb79590d754 (patch)
tree3c8d1170824d605bdb6532cf657b85824fd848dd /weed/shell
parente86da5a4918e0cf663a8c592387c72c850647e4e (diff)
downloadseaweedfs-7d10fdf73720fb3234cd5cacfaf10fb79590d754.tar.xz
seaweedfs-7d10fdf73720fb3234cd5cacfaf10fb79590d754.zip
fix directory lookup nil
Diffstat (limited to 'weed/shell')
-rw-r--r--weed/shell/command_fs_cat.go3
-rw-r--r--weed/shell/command_fs_meta_cat.go3
-rw-r--r--weed/shell/command_fs_mv.go2
3 files changed, 7 insertions, 1 deletions
diff --git a/weed/shell/command_fs_cat.go b/weed/shell/command_fs_cat.go
index 238dee7f9..06c8232c9 100644
--- a/weed/shell/command_fs_cat.go
+++ b/weed/shell/command_fs_cat.go
@@ -56,6 +56,9 @@ func (c *commandFsCat) Do(args []string, commandEnv *CommandEnv, writer io.Write
if err != nil {
return err
}
+ if respLookupEntry.Entry == nil {
+ return fmt.Errorf("file not found: %s", path)
+ }
return filer2.StreamContent(commandEnv.MasterClient, writer, respLookupEntry.Entry.Chunks, 0, math.MaxInt32)
diff --git a/weed/shell/command_fs_meta_cat.go b/weed/shell/command_fs_meta_cat.go
index 9980f67a2..ec9a495f2 100644
--- a/weed/shell/command_fs_meta_cat.go
+++ b/weed/shell/command_fs_meta_cat.go
@@ -55,6 +55,9 @@ func (c *commandFsMetaCat) Do(args []string, commandEnv *CommandEnv, writer io.W
if err != nil {
return err
}
+ if respLookupEntry.Entry == nil {
+ return fmt.Errorf("file not found: %s", path)
+ }
m := jsonpb.Marshaler{
EmitDefaults: true,
diff --git a/weed/shell/command_fs_mv.go b/weed/shell/command_fs_mv.go
index e77755921..b9301ad3c 100644
--- a/weed/shell/command_fs_mv.go
+++ b/weed/shell/command_fs_mv.go
@@ -65,7 +65,7 @@ func (c *commandFsMv) Do(args []string, commandEnv *CommandEnv, writer io.Writer
var targetDir, targetName string
// moving a file or folder
- if err == nil && respDestinationLookupEntry.Entry.IsDirectory {
+ if err == nil && respDestinationLookupEntry.Entry!= nil && respDestinationLookupEntry.Entry.IsDirectory {
// to a directory
targetDir = filepath.ToSlash(filepath.Join(destinationDir, destinationName))
targetName = sourceName