X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/aeb97482e923b5c441dd59e3ca4a7e275ac2b4c2..9ff8293362adff9e7c39d9f620b593f6be661f1e:/hotline/files.go?ds=sidebyside diff --git a/hotline/files.go b/hotline/files.go index 9c3efe2..8d35a94 100644 --- a/hotline/files.go +++ b/hotline/files.go @@ -50,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 } @@ -117,7 +118,11 @@ func getFileNameList(path string, ignoreList []string) (fields []Field, err erro 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)))