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

ensure setting KITTY_PREWARM_SOCKET_REAL_TTY does not clobber the environ

Browse Source
This commit is contained in:
Kovid Goyal
2022-07-20 22:08:36 +05:30
parent 0d83a8866b
commit e0ce0a67cc
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/child.py
View File

@@ -252,7 +252,7 @@ class Child:
env['KITTY_PID'] = getpid() env['KITTY_PID'] = getpid()
if not self.is_prewarmed: if not self.is_prewarmed:
env['KITTY_PREWARM_SOCKET'] = fast_data_types.get_boss().prewarm.socket_env_var() env['KITTY_PREWARM_SOCKET'] = fast_data_types.get_boss().prewarm.socket_env_var()
env['KITTY_PREWARM_SOCKET_REAL_TTY'] = '0' * 32 env['KITTY_PREWARM_SOCKET_REAL_TTY'] = ' ' * 32
if self.cwd: if self.cwd:
# needed in case cwd is a symlink, in which case shells # needed in case cwd is a symlink, in which case shells
# can use it to display the current directory name rather # can use it to display the current directory name rather

2
kitty_tests/prewarm.py
View File

@@ -68,7 +68,7 @@ def socket_child_main(exit_code=0, initial_print=''):
env.update({ env.update({
'TEST_ENV_PASS': 'xyz', 'TEST_ENV_PASS': 'xyz',
'KITTY_PREWARM_SOCKET': p.socket_env_var(), 'KITTY_PREWARM_SOCKET': p.socket_env_var(),
'KITTY_PREWARM_SOCKET_REAL_TTY': '0' * 32, 'KITTY_PREWARM_SOCKET_REAL_TTY': ' ' * 32,
'TERM': 'xterm-kitty', 'TERM': 'xterm-kitty',
'TERMINFO': terminfo_dir 'TERMINFO': terminfo_dir
}) })

6
prewarm-launcher.c
View File

@@ -44,6 +44,9 @@
#define MAX(x, y) __extension__ ({ \ #define MAX(x, y) __extension__ ({ \
__typeof__ (x) a = (x); __typeof__ (y) b = (y); \ __typeof__ (x) a = (x); __typeof__ (y) b = (y); \
a > b ? a : b;}) a > b ? a : b;})
#define MIN(x, y) __extension__ ({ \
__typeof__ (x) a = (x); __typeof__ (y) b = (y); \
a < b ? a : b;})
// }}} // }}}
#define IO_BUZ_SZ 8192 #define IO_BUZ_SZ 8192
@@ -700,7 +703,8 @@ use_prewarmed_process(int argc, char *argv[], char *envp[]) {
while (*envp) { while (*envp) {
if (strncmp(*envp, "KITTY_PREWARM_SOCKET_REAL_TTY=", 2) == 0) { if (strncmp(*envp, "KITTY_PREWARM_SOCKET_REAL_TTY=", 2) == 0) {
sprintf(*envp, "KITTY_PREWARM_SOCKET_REAL_TTY=%s", child_tty_name); char *p = *envp + sizeof("KITTY_PREWARM_SOCKET_REAL_TTY=") - 1;
snprintf(p, strlen(p) + 1, "%s", child_tty_name);
} }
envp++; envp++;
} }