KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get reading data working on macOS

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-24 11:30:57 +05:30
parent 55ede897b9
commit 99d0c2d846
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kittens/ssh/main.py
View File

@ -58,7 +58,7 @@ def get_ssh_data(msg: str, shell_integration_dest: str = DEFAULT_SHELL_INTEGRATI
else: else:
from base64 import standard_b64encode from base64 import standard_b64encode
encoded_data = standard_b64encode(data) encoded_data = standard_b64encode(data)
yield f"{len(encoded_data)}\n".encode('ascii') yield f"{len(encoded_data)}:".encode('ascii')
yield encoded_data yield encoded_data

42
shell-integration/ssh/bootstrap.sh
View File

@ -11,7 +11,7 @@ die() { echo "$*" >/dev/stderr; cleanup_on_bootstrap_exit; exit 1; }
debug() { printf "\033P@kitty-print|%s\033\\" "$(printf "%s" "debug: $1" | base64)"; } debug() { printf "\033P@kitty-print|%s\033\\" "$(printf "%s" "debug: $1" | base64)"; }
saved_tty_settings=$(command stty -g) saved_tty_settings=$(command stty -g)
command stty raw min 1 time 0 || die "stty not available" command stty raw min 1 time 0 -echo || die "stty not available"
trap 'cleanup_on_bootstrap_exit' EXIT trap 'cleanup_on_bootstrap_exit' EXIT
data_started="n" data_started="n"
@ -35,17 +35,35 @@ pending_data=""
data_complete="n" data_complete="n"
printf "\033P@kitty-ssh|%s:%s:%s\033\\" "$hostname" "$password_filename" "$data_password" printf "\033P@kitty-ssh|%s:%s:%s\033\\" "$hostname" "$password_filename" "$data_password"
IFS= read -r size || die "Failed to read data size"; size=""
case "$size" in
" "*) untar() {
die "$size"; command base64 -d | command tar xjf - --no-same-owner -C "$HOME"
;; }
"")
die "Got empty size"; get_data() {
;; # We need a way to read a single byte at a time and to read a specified number of bytes in one invocation.
esac # The options are head -c, read -N and dd
command head -c "$size" < /dev/stdin | command base64 -d | command tar xjf - --no-same-owner -C "$HOME" #
rc="$?" # read -N is not in POSIX and dash/posh dont implement it. Also bash seems to read beyond
# the specified number of bytes into an internal buffer.
#
# head -c reads beyond the specified number of bytes into an internal buffer on macOS
#
# POSIX dd works for one byte at a time but for reading X bytes it needs the GNU iflag=count_bytes
# extension.
while :; do
n=$(command dd bs=1 count=1 2> /dev/null)
if [ "$n" = ":" ]; then break; fi
size="$size$n"
done
# using dd with bs=1 is very slow on Linux, so use head
command head -c "$size" | untar
# command dd bs=1 "count=$size" 2> /dev/null | untar
rc="$?";
}
get_data
command stty "$saved_tty_settings" command stty "$saved_tty_settings"
saved_tty_settings="" saved_tty_settings=""
if [ "$rc" != "0" ]; then die "Failed to extract data transmitted by ssh kitten over the TTY device"; fi if [ "$rc" != "0" ]; then die "Failed to extract data transmitted by ssh kitten over the TTY device"; fi