X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/2e1aec0fcfd412cff22cc4fc996973e403589ad8..7bb8c198e96f367ea99ba649897b6b5716030e4b:/hotline/files.go

diff --git a/hotline/files.go b/hotline/files.go
index 0746b1f..9357bdb 100644
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -30,6 +30,8 @@ func fileTypeFromInfo(info fs.FileInfo) (ft fileType, err error) {
 	return ft, nil
 }
 
+const maxFileSize = 4294967296
+
 func getFileNameList(path string, ignoreList []string) (fields []Field, err error) {
 	files, err := os.ReadDir(path)
 	if err != nil {
@@ -50,13 +52,14 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
 			return fields, err
 		}
 
+		// Check if path is a symlink.  If so, follow it.
 		if fileInfo.Mode()&os.ModeSymlink != 0 {
 			resolvedPath, err := os.Readlink(filepath.Join(path, file.Name()))
 			if err != nil {
 				return fields, err
 			}
 
-			rFile, err := os.Stat(filepath.Join(path, resolvedPath))
+			rFile, err := os.Stat(resolvedPath)
 			if errors.Is(err, os.ErrNotExist) {
 				continue
 			}
@@ -78,12 +81,12 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
 				}
 
 				binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
-				copy(fnwi.Type[:], []byte("fldr"))
+				copy(fnwi.Type[:], "fldr")
 				copy(fnwi.Creator[:], fileCreator)
 			} else {
 				binary.BigEndian.PutUint32(fnwi.FileSize[:], uint32(rFile.Size()))
-				copy(fnwi.Type[:], []byte(fileTypeFromFilename(rFile.Name()).TypeCode))
-				copy(fnwi.Creator[:], []byte(fileTypeFromFilename(rFile.Name()).CreatorCode))
+				copy(fnwi.Type[:], fileTypeFromFilename(rFile.Name()).TypeCode)
+				copy(fnwi.Creator[:], fileTypeFromFilename(rFile.Name()).CreatorCode)
 			}
 		} else if file.IsDir() {
 			dir, err := os.ReadDir(filepath.Join(path, file.Name()))
@@ -99,11 +102,11 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
 			}
 
 			binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
-			copy(fnwi.Type[:], []byte("fldr"))
+			copy(fnwi.Type[:], "fldr")
 			copy(fnwi.Creator[:], fileCreator)
 		} else {
-			// the Hotline protocol does not support fileWrapper sizes > 4GiB due to the 4 byte field size, so skip them
-			if fileInfo.Size() > 4294967296 {
+			// the Hotline protocol does not support file sizes > 4GiB due to the 4 byte field size, so skip them
+			if fileInfo.Size() > maxFileSize {
 				continue
 			}