fix block size reporting in Statfs() (#7)

Resolves #5

Author: arashpayan

README.md

@@ -17,7 +17,7 @@ Installation
 Documentation
 -------------
 
-http://godoc.org/github.com/cloudsoda/go-smb2
+https://pkg.go.dev/github.com/cloudsoda/go-smb2
 
 Examples
 --------
@@ -72,7 +72,6 @@ package main
 
 import (
 	"io"
-	"io/ioutil"
 	"net"
 
 	"github.com/cloudsoda/go-smb2"
@@ -121,7 +120,7 @@ func main() {
 		panic(err)
 	}
 
-	bs, err := ioutil.ReadAll(f)
+	bs, err := io.ReadAll(f)
 	if err != nil {
 		panic(err)
 	}

client.go

@@ -1419,13 +1419,19 @@ func (f *File) Statfs() (FileFsInfo, error) {
 }
 
 type FileFsInfo interface {
+	// The number of bytes in a single block on the volume. A block is the smallest allocation unit on the volume.
 	BlockSize() uint64
+	// Number of sectors in each block.
 	FragmentSize() uint64
+	// Total number of blocks on the volume that are available to the user.
 	TotalBlockCount() uint64
+	// Total number of blocks on the volume.
 	FreeBlockCount() uint64
+	// Total number of free blocks on the volume that are available to the user.
 	AvailableBlockCount() uint64
 }
 
+// Definitions: https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-fscc/63768db7-9012-4209-8cca-00781e7322f5
 type fileFsFullSizeInformation struct {
 	TotalAllocationUnits           int64
 	CallerAvailableAllocationUnits int64
@@ -1435,7 +1441,7 @@ type fileFsFullSizeInformation struct {
 }
 
 func (fi *fileFsFullSizeInformation) BlockSize() uint64 {
-	return uint64(fi.BytesPerSector)
+	return uint64(fi.BytesPerSector) * uint64(fi.SectorsPerAllocationUnit)
 }
 
 func (fi *fileFsFullSizeInformation) FragmentSize() uint64 {

example_test.go

@@ -3,7 +3,6 @@ package smb2_test
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 
 	"github.com/cloudsoda/go-smb2"
@@ -53,7 +52,7 @@ func Example() {
 		panic(err)
 	}
 
-	bs, err := ioutil.ReadAll(f)
+	bs, err := io.ReadAll(f)
 	if err != nil {
 		panic(err)
 	}

go.mod

@@ -4,5 +4,12 @@ go 1.20
 
 require (
 	github.com/geoffgarside/ber v1.1.0
-	golang.org/x/crypto v0.8.0
+	github.com/stretchr/testify v1.8.3
+	golang.org/x/crypto v0.9.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,4 +1,16 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/geoffgarside/ber v1.1.0 h1:qTmFG4jJbwiSzSXoNJeHcOprVzZ8Ulde2Rrrifu5U9w=
 github.com/geoffgarside/ber v1.1.0/go.mod h1:jVPKeCbj6MvQZhwLYsGwaGI52oUorHoHKNecGT85ZCc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
 golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

smb2_test.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"os"
 	"reflect"
@@ -18,6 +17,7 @@ import (
 	"time"
 
 	"github.com/cloudsoda/go-smb2"
+	"github.com/stretchr/testify/require"
 )
 
 func join(ss ...string) string {
@@ -189,9 +189,8 @@ func TestReaddir(t *testing.T) {
 	}
 
 	fi2, err = d2.Readdir(1)
-	if err != io.EOF {
-		t.Error("unexpected error: ", err)
-	}
+	require.Equal(t, io.EOF, err)
+	require.Empty(t, fi2)
 }
 
 func TestFile(t *testing.T) {
@@ -355,7 +354,7 @@ func TestSymlink(t *testing.T) {
 
 		f, err = fs.Open(testDir + `\linkToTestFile`)
 		if err == nil { // if it supports follow-symlink
-			bs, err := ioutil.ReadAll(f)
+			bs, err := io.ReadAll(f)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -484,7 +483,7 @@ func TestRename(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer f.Close()
-	bs, err := ioutil.ReadAll(f)
+	bs, err := io.ReadAll(f)
 	if err != nil {
 		t.Fatal(err)
 	}