Merge pull request willscott#37 from iineva/master

Fix willscott#36
showgp · May 10, 2021 · de655f6 · de655f6
2 parents 8a05dee + 9e504f1
commit de655f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/nfs_onreaddir.go b/nfs_onreaddir.go
@@ -142,9 +142,9 @@ func onReadDir(ctx context.Context, w *response, userHandle Handler) error {
 		if err := xdr.Write(writer, uint64(1)); err != nil { // cookie
 			return &NFSStatusError{NFSStatusServerFault, err}
 		}
-	}
-	if len(entities) > 0 || obj.Cookie == 0 {
-		if err := xdr.Write(writer, uint32(1)); err != nil { // next
+		next := 1
+		if len(entities) == 0 { next = 0 }
+		if err := xdr.Write(writer, uint32(next)); err != nil { // next
 			return &NFSStatusError{NFSStatusServerFault, err}
 		}
 	}

diff --git a/nfs_onreaddirplus.go b/nfs_onreaddirplus.go
@@ -170,9 +170,9 @@ func onReadDirPlus(ctx context.Context, w *response, userHandle Handler) error {
 		if err := xdr.Write(writer, uint32(0)); err != nil { // hasHandle
 			return &NFSStatusError{NFSStatusServerFault, err}
 		}
-	}
-	if len(entities) > 0 || obj.Cookie == 0 {
-		if err := xdr.Write(writer, uint32(1)); err != nil { // next
+		next := 1
+		if len(entities) == 0 { next = 0 }
+		if err := xdr.Write(writer, uint32(next)); err != nil { // next
 			return &NFSStatusError{NFSStatusServerFault, err}
 		}
 	}