Merged the user and group retrieval logic into a single function

Author: vzfdn

.gitignore

@@ -1,4 +1,5 @@
 gaze
+gaze.exe
 *.out
 *.test
 .vscode/

entry/entry.go

@@ -18,14 +18,9 @@ func (e Entry) Permission() string {
 	return e.info.Mode().String()
 }
 
-// User returns the user name associated with the fileInfo inside the Entry.
-func (e Entry) User() string {
-	return FileOwner(e)
-}
-
-// Group returns the group name associated with the fileInfo inside the Entry.
-func (e Entry) Group() string {
-	return FileGroup(e)
+// User returns the user and group name associated with the fileInfo inside the Entry.
+func (e Entry) UserAndGroup() string {
+	return FileUserGroup(e)
 }
 
 // Time returns the formatted modification time of the Entry.

entry/fs_unix.go

@@ -4,25 +4,29 @@ package entry
 
 import (
 	"fmt"
-	"log"
 	"os/user"
 	"syscall"
 )
 
-func FileOwner(e Entry) string {
-	stat := e.info.Sys().(*syscall.Stat_t)
-	u, err := user.LookupId(fmt.Sprint(stat.Uid))
-	if err != nil {
-		log.Fatal(err)
+// FileUserGroup retrieves the file owner and group names for the given Entry.
+func FileUserGroup(e Entry) string {
+	stat, ok := e.info.Sys().(*syscall.Stat_t)
+	if !ok {
+		return "0  0" 
+	}
+	
+	uidStr := fmt.Sprint(stat.Uid)
+	gidStr := fmt.Sprint(stat.Gid)
+
+	owner := uidStr
+	if u, err := user.LookupId(uidStr); err == nil {
+		owner = u.Username
 	}
-	return u.Username
-}
 
-func FileGroup(e Entry) string {
-	stat := e.info.Sys().(*syscall.Stat_t)
-	g, err := user.LookupGroupId(fmt.Sprint(stat.Gid))
-	if err != nil {
-		log.Fatal(err)
+	group := gidStr
+	if g, err := user.LookupGroupId(gidStr); err == nil {
+		group = g.Name
 	}
-	return g.Name
+
+	return fmt.Sprintf("%s  %s", owner, group)
 }

entry/fs_windows.go

@@ -3,69 +3,50 @@
 package entry
 
 import (
-	"syscall"
-	"unsafe"
-)
+	"fmt"
+	"path/filepath"
 
-var (
-	modadvapi32         = syscall.NewLazyDLL("advapi32.dll")
-	procGetSecurityInfo = modadvapi32.NewProc("GetSecurityInfo")
+	"golang.org/x/sys/windows"
 )
 
-// Get file owner using Windows SID
-func FileOwner(e Entry) string {
-	path, err := syscall.UTF16PtrFromString(e.info.Name())
+// FileUserGroup retrieves the file's owner and group names for the given Entry.
+func FileUserGroup(e Entry) string {
+	securityFlags := windows.OWNER_SECURITY_INFORMATION | windows.GROUP_SECURITY_INFORMATION
+	sd, err := windows.GetNamedSecurityInfo(
+		filepath.Clean(e.info.Name()),
+		windows.SE_FILE_OBJECT,
+		windows.SECURITY_INFORMATION(securityFlags),
+	)
 	if err != nil {
-		return ""
+		return "unknown  unknown"  
 	}
 
-	var sid *syscall.SID
-	var secDesc uintptr
-
-	err = syscall.GetNamedSecurityInfo(
-		path,
-		syscall.SE_FILE_OBJECT,
-		syscall.OWNER_SECURITY_INFORMATION,
-		&sid,
-		nil,
-		nil,
-		nil,
-		&secDesc,
-	)
-
-	if err != nil {
-		return ""
+	owner := "unknown"
+	if ownerSid, _, err := sd.Owner(); err == nil && ownerSid != nil {
+		owner = sidToName(ownerSid)
+	} else if ownerSid != nil {
+		owner = ownerSid.String()  
 	}
 
-	sidStr, _ := sid.String()
-	return sidStr
+	group := "unknown"
+	if groupSid, _, err := sd.Group(); err == nil && groupSid != nil {
+		group = sidToName(groupSid)
+	} else if groupSid != nil {
+		group = groupSid.String()  
+	}
+	
+	return fmt.Sprintf("%s  %s", owner, group)
 }
 
-// Get file group using Windows SID
-func FileGroup(e Entry) string {
-	path, err := syscall.UTF16PtrFromString(e.info.Name())
-	if err != nil {
-		return ""
+// sidToName converts a Windows SID into a human-readable account name ("DOMAIN\User").
+func sidToName(sid *windows.SID) string {
+	if sid == nil {
+		return "unknown"  
 	}
 
-	var sid *syscall.SID
-	var secDesc uintptr
-
-	err = syscall.GetNamedSecurityInfo(
-		path,
-		syscall.SE_FILE_OBJECT,
-		syscall.GROUP_SECURITY_INFORMATION,
-		nil,
-		&sid,
-		nil,
-		nil,
-		&secDesc,
-	)
-
+	name, domain, _, err := sid.LookupAccount("")
 	if err != nil {
-		return ""
+		return sid.String() 
 	}
-
-	sidStr, _ := sid.String()
-	return sidStr
+	return fmt.Sprintf("%s\\%s", domain, name)
 }

entry/long.go

@@ -11,10 +11,9 @@ func Long(displayEntries []Entry) string {
 	sb.WriteString(line)
 	const pad = 2
 	for _, e := range displayEntries {
-		line = fmt.Sprintf("%s%*s%s%*s%s%*s%s%*s%s%*s%s\n",
+		line = fmt.Sprintf("%s%*s%s%*s%s%*s%s%*s%s\n",
 			e.Permission(), pad, "",
-			e.User(), pad, "",
-			e.Group(), pad, "",
+			e.UserAndGroup(), pad, "",
 			e.Time(), pad, "",
 			HumanReadableSize((e.Size())), pad, "",
 			e.Name(),

go.mod

@@ -4,4 +4,4 @@ go 1.23
 
 require golang.org/x/term v0.28.0
 
-require golang.org/x/sys v0.29.0 // indirect
+require golang.org/x/sys v0.29.0