Fix handling of symlinks in Files dir

[rbdr/mobius] / hotline / files.go

diff --git a/hotline/files.go b/hotline/files.go
index aa248f81893f06ca0d61e2b27e0f106a9b707c10..8d35a948da63caaa7ac5ef960b8def13eaf8cdb6 100644 (file)
--- a/hotline/files.go
+++ b/hotline/files.go
@@ -4,7 +4,6 @@ import (
        "encoding/binary"
        "errors"
        "io/fs"
-       "io/ioutil"
        "os"
        "path/filepath"
        "regexp"
@@ -51,13 +50,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
                        }
@@ -66,7 +66,7 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                        }
 
                        if rFile.IsDir() {
-                               dir, err := ioutil.ReadDir(filepath.Join(path, file.Name()))
+                               dir, err := os.ReadDir(filepath.Join(path, file.Name()))
                                if err != nil {
                                        return fields, err
                                }
@@ -79,16 +79,15 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                                }
 
                                binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
-                               copy(fnwi.Type[:], []byte("fldr")[:])
-                               copy(fnwi.Creator[:], fileCreator[:])
+                               copy(fnwi.Type[:], []byte("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[:], []byte(fileTypeFromFilename(rFile.Name()).TypeCode))
+                               copy(fnwi.Creator[:], []byte(fileTypeFromFilename(rFile.Name()).CreatorCode))
                        }
-
                } else if file.IsDir() {
-                       dir, err := ioutil.ReadDir(filepath.Join(path, file.Name()))
+                       dir, err := os.ReadDir(filepath.Join(path, file.Name()))
                        if err != nil {
                                return fields, err
                        }
@@ -101,8 +100,8 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                        }
 
                        binary.BigEndian.PutUint32(fnwi.FileSize[:], c)
-                       copy(fnwi.Type[:], []byte("fldr")[:])
-                       copy(fnwi.Creator[:], fileCreator[:])
+                       copy(fnwi.Type[:], []byte("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 {
@@ -114,16 +113,20 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                                return nil, err
                        }
 
-                       copy(fnwi.FileSize[:], hlFile.totalSize()[:])
-                       copy(fnwi.Type[:], hlFile.ffo.FlatFileInformationFork.TypeSignature[:])
-                       copy(fnwi.Creator[:], hlFile.ffo.FlatFileInformationFork.CreatorSignature[:])
+                       copy(fnwi.FileSize[:], hlFile.totalSize())
+                       copy(fnwi.Type[:], hlFile.ffo.FlatFileInformationFork.TypeSignature)
+                       copy(fnwi.Creator[:], hlFile.ffo.FlatFileInformationFork.CreatorSignature)
                }
 
-               strippedName := strings.Replace(file.Name(), ".incomplete", "", -1)
+               strippedName := strings.ReplaceAll(file.Name(), ".incomplete", "")
+               strippedName, err = txtEncoder.String(strippedName)
+               if err != nil {
+                       return nil, err
+               }
 
                nameSize := make([]byte, 2)
                binary.BigEndian.PutUint16(nameSize, uint16(len(strippedName)))
-               copy(fnwi.NameSize[:], nameSize[:])
+               copy(fnwi.NameSize[:], nameSize)
 
                fnwi.name = []byte(strippedName)
 
@@ -131,7 +134,7 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro
                if err != nil {
                        return nil, err
                }
-               fields = append(fields, NewField(fieldFileNameWithInfo, b))
+               fields = append(fields, NewField(FieldFileNameWithInfo, b))
        }
 
        return fields, nil