mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-18 22:44:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2023-02-28 15:26:17 +05:30
parent 1b2fe90ed1
commit 944e036611
5 changed files with 69 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/cmd/ssh/askpass.go
View File

@@ -72,7 +72,10 @@ func RunSSHAskpass() {
break
}
}
data = shm.ReadWithSize(data_shm, 1)
data, err = shm.ReadWithSize(data_shm, 1)
if err != nil {
fatal(fmt.Errorf("Failed to read from SHM file with error: %w", err))
}
response := ""
if is_confirm {
var ok bool

6
tools/cmd/ssh/main.go
View File

@@ -65,11 +65,7 @@ func get_destination(hostname string) (username, hostname_for_match string) {
}
func read_data_from_shared_memory(shm_name string) ([]byte, error) {
data, err := shm.ReadWithSizeAndUnlink(shm_name, func(f *os.File) error {
s, err := f.Stat()
if err != nil {
return fmt.Errorf("Failed to stat SHM file with error: %w", err)
}
data, err := shm.ReadWithSizeAndUnlink(shm_name, func(s fs.FileInfo) error {
if stat, ok := s.Sys().(unix.Stat_t); ok {
if os.Getuid() != int(stat.Uid) || os.Getgid() != int(stat.Gid) {
return fmt.Errorf("Incorrect owner on SHM file")