From 949860ff2297705638a6afbce0514e0a9087bdab Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 9 Feb 2025 12:59:33 +0530
Subject: [PATCH] ssh kitten: Fix incorrect copying of data files when using
 the python interpreter and also fix incorrect hard link detection

---
 docs/changelog.rst    |  2 ++
 kittens/ssh/config.go | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d2d2d52a2..bd3f1c8a3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -120,6 +120,8 @@ Detailed list of changes
 
 - XTGETTCAP: Fix response invalid for empty string capabilities (:pull:`8304`)
 
+- ssh kitten: Fix incorrect copying of data files when using the python interpreter and also fix incorrect hard link detection (:disc:`8308`)
+
 0.39.1 [2025-02-01]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/kittens/ssh/config.go b/kittens/ssh/config.go
index 4d4b21067..7b0be78ac 100644
--- a/kittens/ssh/config.go
+++ b/kittens/ssh/config.go
@@ -12,6 +12,7 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"syscall"
 	"time"
 
 	"kitty/tools/config"
@@ -245,7 +246,7 @@ func get_file_data(callback func(h *tar.Header, data []byte) error, seen map[fil
 	if err != nil {
 		return err
 	}
-	u, ok := s.Sys().(unix.Stat_t)
+	u, unix_stat_conv_ok := s.Sys().(*syscall.Stat_t)
 	cb := func(h *tar.Header, data []byte, arcname string) error {
 		h.Name = arcname
 		if h.Typeflag == tar.TypeDir {
@@ -255,7 +256,7 @@ func get_file_data(callback func(h *tar.Header, data []byte) error, seen map[fil
 		h.Mode = int64(s.Mode().Perm())
 		h.ModTime = s.ModTime()
 		h.Format = tar.FormatPAX
-		if ok {
+		if unix_stat_conv_ok {
 			h.AccessTime = time.Unix(0, u.Atim.Nano())
 			h.ChangeTime = time.Unix(0, u.Ctim.Nano())
 		}
@@ -319,14 +320,13 @@ func get_file_data(callback func(h *tar.Header, data []byte) error, seen map[fil
 			}
 		}
 	case 0: // Regular file
-		fid := file_unique_id{dev: uint64(u.Dev), inode: uint64(u.Ino)}
-		if prev, ok := seen[fid]; ok { // Hard link
-			err = cb(&tar.Header{Typeflag: tar.TypeLink, Linkname: prev}, nil, arcname)
-			if err != nil {
-				return err
+		if unix_stat_conv_ok {
+			fid := file_unique_id{dev: uint64(u.Dev), inode: uint64(u.Ino)}
+			if prev, ok := seen[fid]; ok { // Hard link
+				return cb(&tar.Header{Typeflag: tar.TypeLink, Linkname: prev}, nil, arcname)
 			}
+			seen[fid] = arcname
 		}
-		seen[fid] = arcname
 		data, err := os.ReadFile(local_path)
 		if err != nil {
 			return err