CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-07-06 07:41:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename file_fd to file_fd_plus_one so zero value means invalid fd

Browse source 
Agent-Logs-Url: https://github.com/kovidgoyal/kitty/sessions/e5f07308-d11d-43d9-9dd5-75b3a10c6e2e

Co-authored-by: kovidgoyal <1308621+kovidgoyal@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-04-01 15:29:12 +00:00 • committed by GitHub
parent 68cb5760b3
commit c5afef1142
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kitty/dnd.c
View file

@ -73,9 +73,9 @@ drop_free_dir_handles(Window *w) {
static void
drop_close_file_fd(Window *w) {
if (w->drop.file_fd >= 0) {
safe_close(w->drop.file_fd, __FILE__, __LINE__);
w->drop.file_fd = -1;
if (w->drop.file_fd_plus_one) {
safe_close(w->drop.file_fd_plus_one - 1, __FILE__, __LINE__);
w->drop.file_fd_plus_one = 0;
}
if (w->drop.file_send_timer) {
remove_main_loop_timer(w->drop.file_send_timer);
@ -100,7 +100,6 @@ reset_drop(Window *w) {
bool wanted = w->drop.wanted; uint32_t cid = w->drop.client_id;
drop_free_data(w);
zero_at_ptr(&w->drop);
w->drop.file_fd = -1;
if (wanted) {
w->drop.wanted = wanted;
w->drop.client_id = cid;
@ -111,7 +110,7 @@ void
drop_register_window(Window *w, const uint8_t *payload, size_t payload_sz, bool on, uint32_t client_id, bool more) {
w->drop.wanted = on;
w->drop.client_id = client_id;
if (!on) { drop_free_data(w); zero_at_ptr(&w->drop); w->drop.file_fd = -1; return; }
if (!on) { drop_free_data(w); zero_at_ptr(&w->drop); return; }
if (!payload || !payload_sz) return;
size_t sz = w->drop.registered_mimes ? strlen(w->drop.registered_mimes) : 0;
if (sz + payload_sz > 1024 * 1024) return;
@ -527,7 +526,7 @@ static void
file_send_timer_callback(id_type timer_id UNUSED, void *x) {
id_type id = (uintptr_t)x;
Window *w = window_for_window_id(id);
if (!w || w->drop.file_fd < 0) return;
if (!w || !w->drop.file_fd_plus_one) return;
w->drop.file_send_timer = 0;
if (monotonic() - w->drop.last_file_send_at > s_to_monotonic_t(FILE_SEND_TIMEOUT_SECONDS)) {
drop_close_file_fd(w);
@ -548,7 +547,7 @@ drop_send_file_chunks(Window *w) {
while (1) {
char buf[FILE_CHUNK_SIZE];
ssize_t n;
do { n = read(w->drop.file_fd, buf, sizeof(buf)); } while (n < 0 && errno == EINTR);
do { n = read(w->drop.file_fd_plus_one - 1, buf, sizeof(buf)); } while (n < 0 && errno == EINTR);
if (n < 0) {
drop_close_file_fd(w);
drop_send_error(w, EIO);
@ -564,7 +563,7 @@ drop_send_file_chunks(Window *w) {
if (sent > 0) w->drop.last_file_send_at = monotonic();
if (sent < (size_t)n) {
/* Partial send: rewind file pointer and retry via timer */
if (lseek(w->drop.file_fd, -(off_t)(((size_t)n) - sent), SEEK_CUR) < 0) {
if (lseek(w->drop.file_fd_plus_one - 1, -(off_t)(((size_t)n) - sent), SEEK_CUR) < 0) {
drop_close_file_fd(w);
drop_send_error(w, EIO);
return;
@ -601,7 +600,7 @@ drop_send_file_data(Window *w, const char *path) {
return;
}
if (!S_ISREG(st.st_mode)) { drop_send_error(w, EINVAL); safe_close(fd, __FILE__, __LINE__); return; }
w->drop.file_fd = fd;
w->drop.file_fd_plus_one = fd + 1;
w->drop.last_file_send_at = monotonic();
drop_send_file_chunks(w);
}

1
kitty/state.c
View file

@ -307,7 +307,6 @@ initialize_window(Window *w, PyObject *title, bool init_gpu_resources) {
else {
w->render_data.vao_idx = -1;
}
w->drop.file_fd = -1;
}
static id_type

2
kitty/state.h
View file

@ -280,7 +280,7 @@ typedef struct Window {
DirHandle *dir_handles; size_t num_dir_handles, dir_handles_capacity;
uint32_t next_dir_handle_id;
int file_fd; /* open file descriptor for chunked file send, -1 when none */
int file_fd_plus_one; /* open file descriptor + 1 for chunked file send, 0 when none */
monotonic_t last_file_send_at; /* time of last successful file chunk write */
id_type file_send_timer; /* pending file-send retry timer, 0 = none */
} drop;