12055: Merge branch '12055-nodemanager-ec2-tags'

[arvados.git] / sdk / go / arvados / collection_fs.go

diff --git a/sdk/go/arvados/collection_fs.go b/sdk/go/arvados/collection_fs.go
index 01d5b65eb2f13257c8dfe0b2efa1cc2dea654391..f80180f8ed39d2c1c4a9c60500cea2f2967906e4 100644 (file)
--- a/sdk/go/arvados/collection_fs.go
+++ b/sdk/go/arvados/collection_fs.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvados
 
 import (
@@ -61,11 +65,13 @@ func (cd *collectionDir) Readdir(count int) ([]os.FileInfo, error) {
        } else if len(ret) == 0 {
                return nil, io.EOF
        }
-       if count > len(ret) {
+       var err error
+       if count >= len(ret) {
                count = len(ret)
+               err = io.EOF
        }
        cd.dirents = cd.dirents[count:]
-       return ret[:count], nil
+       return ret[:count], err
 }
 
 // Stat implements os.File.
@@ -186,8 +192,6 @@ func (c *collectionFS) Open(name string) (http.File, error) {
        // entries below it.
        children := map[string]collectionDirent{}
        for fnm, size := range filesizes {
-               if fnm == name {
-               }
                if !strings.HasPrefix(fnm, name+"/") {
                        continue
                }