circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 14:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-04-26 21:12:23 +01:00
parent bcd17cf99a b844cafb9c
commit e4a439aa0c
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
file.c
View File

@@ -804,7 +804,7 @@ file_read_cancel(struct client_files *files, struct imsg *imsg)
}
/* Handle a write ready message (server). */
void
int
file_write_ready(struct client_files *files, struct imsg *imsg)
{
struct msg_write_ready *msg = imsg->data;
@@ -812,19 +812,20 @@ file_write_ready(struct client_files *files, struct imsg *imsg)
struct client_file find, *cf;
if (msglen != sizeof *msg)
fatalx("bad MSG_WRITE_READY size");
return (-1);
find.stream = msg->stream;
if ((cf = RB_FIND(client_files, files, &find)) == NULL)
return;
return (0);
if (msg->error != 0) {
cf->error = msg->error;
file_fire_done(cf);
} else
file_push(cf);
return (0);
}
/* Handle read data message (server). */
void
int
file_read_data(struct client_files *files, struct imsg *imsg)
{
struct msg_read_data *msg = imsg->data;
@@ -834,10 +835,10 @@ file_read_data(struct client_files *files, struct imsg *imsg)
size_t bsize = msglen - sizeof *msg;
if (msglen < sizeof *msg)
fatalx("bad MSG_READ_DATA size");
return (-1);
find.stream = msg->stream;
if ((cf = RB_FIND(client_files, files, &find)) == NULL)
return;
return (0);
log_debug("file %d read %zu bytes", cf->stream, bsize);
if (cf->error == 0 && !cf->closed) {
@@ -847,10 +848,11 @@ file_read_data(struct client_files *files, struct imsg *imsg)
} else
file_fire_read(cf);
}
return (0);
}
/* Handle a read done message (server). */
void
int
file_read_done(struct client_files *files, struct imsg *imsg)
{
struct msg_read_done *msg = imsg->data;
@@ -858,12 +860,13 @@ file_read_done(struct client_files *files, struct imsg *imsg)
struct client_file find, *cf;
if (msglen != sizeof *msg)
fatalx("bad MSG_READ_DONE size");
return (-1);
find.stream = msg->stream;
if ((cf = RB_FIND(client_files, files, &find)) == NULL)
return;
return (0);
log_debug("file %d read done", cf->stream);
cf->error = msg->error;
file_fire_done(cf);
return (0);
}