version 0.11.1

Author: cuhsat

internal/test/test.go

@@ -2,7 +2,7 @@
 package test
 
 import (
-	"path"
+	"path/filepath"
 	"runtime"
 )
 
@@ -13,5 +13,5 @@ func Testdata(name string) string {
 		return "error"
 	}
 
-	return path.Join(path.Dir(c), "..", "testdata", name)
+	return filepath.Join(filepath.Dir(c), "..", "testdata", name)
 }

internal/zip/zip_utils.go

@@ -5,7 +5,6 @@ import (
 	"archive/zip"
 	"io"
 	"os"
-	"path"
 	"path/filepath"
 	"slices"
 )
@@ -21,7 +20,7 @@ func Index(name string) (files []string, err error) {
 
 	for _, f := range a.File {
 		if !f.FileInfo().IsDir() {
-			files = append(files, filepath.ToSlash(f.Name))
+			files = append(files, f.Name)
 		}
 	}
 
@@ -40,14 +39,14 @@ func Unzip(name, dir string) (err error) {
 	defer a.Close()
 
 	for _, f := range a.File {
-		file := path.Join(dir, filepath.ToSlash(f.Name))
+		file := filepath.Join(dir, f.Name)
 
 		if f.FileInfo().IsDir() {
 			os.MkdirAll(file, os.ModePerm)
 			continue
 		}
 
-		if err = os.MkdirAll(path.Dir(file), os.ModePerm); err != nil {
+		if err = os.MkdirAll(filepath.Dir(file), os.ModePerm); err != nil {
 			return err
 		}
 

pkg/ffind/ffind_test.go

@@ -3,7 +3,6 @@ package ffind
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 	"reflect"
 	"slices"
@@ -15,8 +14,8 @@ import (
 
 var (
 	tmp, _  = os.MkdirTemp(os.TempDir(), "ffind")
-	archive = path.Join(filepath.ToSlash(tmp), "archive.zip")
-	sysroot = path.Join(filepath.ToSlash(tmp), "sysroot")
+	archive = filepath.Join(tmp, "archive.zip")
+	sysroot = filepath.Join(tmp, "sysroot")
 )
 
 func TestFind(t *testing.T) {

pkg/fmount/dd/dd.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -49,14 +48,14 @@ func Mount(img, dir string, so bool) (sysroot string, err error) {
 	}
 
 	for i, l := range ls[1:] {
-		p := path.Join(dir, fmt.Sprintf("p%d", i+1))
+		p := filepath.Join(dir, fmt.Sprintf("p%d", i+1))
 
 		if err := os.MkdirAll(p, mode); err != nil {
 			sys.Error(err)
 			continue
 		}
 
-		d := path.Join("/dev", l)
+		d := filepath.Join("/dev", l)
 
 		sp, err := detectMagic(d)
 
@@ -121,7 +120,7 @@ func Unmount(img string) (err error) {
 		}
 
 		for _, d := range ls[1:] {
-			if err = umount(path.Join("/dev", d)); err != nil {
+			if err = umount(filepath.Join("/dev", d)); err != nil {
 				sys.Error(err)
 				continue
 			}

pkg/fmount/fmount.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -43,7 +42,7 @@ func Extract(img string) (p string, err error) {
 
 	dir := filepath.Dir(img)
 
-	p = path.Join(dir, i[0])
+	p = filepath.Join(dir, i[0])
 
 	if _, err = os.Stat(p); !os.IsNotExist(err) {
 		err = errors.New("file already exists")

pkg/windows/system.go

@@ -3,7 +3,6 @@ package windows
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 
 	"github.com/cuhsat/fact/internal/sys"
@@ -14,7 +13,7 @@ func EnumSystem(sysroot string, out chan<- string) {
 		sysroot = os.ExpandEnv("$SYSTEMDRIVE")
 	}
 
-	root := path.Join(filepath.ToSlash(sysroot), "Windows")
+	root := filepath.Join(sysroot, "Windows")
 
 	if _, err := os.Stat(root); err != nil {
 		sys.Error(err)
@@ -31,7 +30,7 @@ func EnumSystem(sysroot string, out chan<- string) {
 		"[Pp]refetch/*.pf",
 		"[Aa]m[Cc]ompat/[Pp]rograms/[Aa]m[Cc]ache.hve",
 	} {
-		files, err := filepath.Glob(path.Join(root, artifact))
+		files, err := filepath.Glob(filepath.Join(root, artifact))
 
 		if err != nil {
 			sys.Error(err)

pkg/windows/user.go

@@ -3,7 +3,6 @@ package windows
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 
 	"github.com/cuhsat/fact/internal/sys"
@@ -14,7 +13,7 @@ func EnumUsers(sysroot string, out chan<- string) {
 		sysroot = os.ExpandEnv("$HOMEDRIVE")
 	}
 
-	root := path.Join(filepath.ToSlash(sysroot), "Users")
+	root := filepath.Join(sysroot, "Users")
 
 	if _, err := os.Stat(root); err != nil {
 		sys.Error(err)
@@ -52,7 +51,7 @@ func EnumUsers(sysroot string, out chan<- string) {
 			"[Aa]pp[Dd]ata/[Rr]oaming/*/*/[Pp]rofiles/*/places.sqlite",
 			"[Aa]pp[Dd]ata/[Rr]oaming/*/*/*/[Hh]istory",
 		} {
-			files, err := filepath.Glob(path.Join(root, fi.Name(), artifact))
+			files, err := filepath.Glob(filepath.Join(root, fi.Name(), artifact))
 
 			if err != nil {
 				sys.Error(err)