dnutiu/simplFT
dnutiu/simplFT
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for Getfile

Browse source
This commit is contained in:
Denis-Cosmin Nutiu 2017-12-22 18:38:24 +02:00
parent 88125be1af
commit 886a478428
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/server/commands.go
View file

@ -63,7 +63,7 @@ func SendASCIIPic(c Client, path string) error {
// GetFile sends the file to the client and returns true if it succeeds and false otherwise. // GetFile sends the file to the client and returns true if it succeeds and false otherwise.
// it also returns the total number of send bytes. // it also returns the total number of send bytes.
func GetFile(c Client, path string) (int, error) { func GetFile(c Client, path string) (int64, error) {
fileName, sanitized := sanitizeFilePath(path) fileName, sanitized := sanitizeFilePath(path)
if sanitized { if sanitized {
return 0, ErrSlashNotAllowed return 0, ErrSlashNotAllowed
@ -76,22 +76,7 @@ func GetFile(c Client, path string) (int, error) {
} }
defer file.Close() defer file.Close()
var data = make([]byte, DataBufferSize, DataBufferSize) totalSend, err := io.Copy(c.Connection(), file)
totalSend := 0
for {
n, err := file.Read(data)
if err == io.EOF {
break
} else if err != nil {
return totalSend, err
}
totalSend += n
_, err = c.Connection().Write(data)
if err != nil {
break
}
}
return totalSend, nil return totalSend, nil
} }