@@ -6,7 +6,6 @@ package sftp
6
6
import (
7
7
"fmt"
8
8
"os"
9
- "os/user"
10
9
"path"
11
10
"syscall"
12
11
"time"
@@ -20,14 +19,12 @@ func runLsStatt(dirent os.FileInfo, statt *syscall.Stat_t) string {
20
19
21
20
typeword := runLsTypeWord (dirent )
22
21
numLinks := statt .Nlink
23
- username := fmt .Sprintf ("%d" , statt .Uid )
24
- if usr , err := user .LookupId (username ); err == nil {
25
- username = usr .Username
26
- }
27
- groupname := fmt .Sprintf ("%d" , statt .Gid )
28
- if grp , err := user .LookupGroupId (groupname ); err == nil {
29
- groupname = grp .Name
30
- }
22
+ uid := statt .Uid
23
+ gid := statt .Gid
24
+ username := fmt .Sprintf ("%d" , uid )
25
+ groupname := fmt .Sprintf ("%d" , gid )
26
+ // TODO FIXME: uid -> username, gid -> groupname lookup for ls -l format output
27
+
31
28
mtime := dirent .ModTime ()
32
29
monthStr := mtime .Month ().String ()[0 :3 ]
33
30
day := mtime .Day ()
@@ -40,9 +37,7 @@ func runLsStatt(dirent os.FileInfo, statt *syscall.Stat_t) string {
40
37
yearOrTime = fmt .Sprintf ("%d" , year )
41
38
}
42
39
43
- return fmt .Sprintf ("%s %4d %-8s %-8s %8d %s %2d %5s %s" , typeword ,
44
- numLinks , username , groupname , dirent .Size (), monthStr , day ,
45
- yearOrTime , dirent .Name ())
40
+ return fmt .Sprintf ("%s %4d %-8s %-8s %8d %s %2d %5s %s" , typeword , numLinks , username , groupname , dirent .Size (), monthStr , day , yearOrTime , dirent .Name ())
46
41
}
47
42
48
43
// ls -l style output for a file, which is in the 'long output' section of a readdir response packet
0 commit comments