circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Update imsg and remove workaround.

Browse Source
This commit is contained in:
Nicholas Marriott
2024-11-27 10:30:52 +00:00
parent db771ec6e3
commit 252f41818e
6 changed files with 57 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
proc.c
View File

@ -55,7 +55,6 @@ struct tmuxpeer {
struct tmuxproc *parent;
struct imsgbuf ibuf;
int lastfd;
struct event event;
uid_t uid;
@ -72,7 +71,7 @@ static int peer_check_version(struct tmuxpeer *, struct imsg *);
static void proc_update_event(struct tmuxpeer *);
static void
proc_event_cb(int fd, short events, void *arg)
proc_event_cb(__unused int fd, short events, void *arg)
{
struct tmuxpeer *peer = arg;
ssize_t n;
@ -90,14 +89,7 @@ proc_event_cb(int fd, short events, void *arg)
}
if (n == 0)
break;
fd = imsg_get_fd(&imsg);
log_debug("peer %p message %d fd %d", peer,
imsg.hdr.type, fd);
if (fd != -1) {
if (peer->lastfd != -1)
close(peer->lastfd);
peer->lastfd = fd;
}
log_debug("peer %p message %d", peer, imsg.hdr.type);
if (peer_check_version(peer, &imsg) != 0) {
imsg_free(&imsg);
@ -313,7 +305,6 @@ proc_add_peer(struct tmuxproc *tp, int fd,
peer = xcalloc(1, sizeof *peer);
peer->parent = tp;
peer->lastfd = -1;
peer->dispatchcb = dispatchcb;
peer->arg = arg;
@ -342,8 +333,6 @@ proc_remove_peer(struct tmuxpeer *peer)
event_del(&peer->event);
imsgbuf_clear(&peer->ibuf);
if (peer->lastfd != -1)
close(peer->lastfd);
close(peer->ibuf.fd);
free(peer);
}
@ -395,12 +384,3 @@ proc_get_peer_uid(struct tmuxpeer *peer)
{
return (peer->uid);
}
int
proc_get_last_fd(struct tmuxpeer *peer)
{
int fd = peer->lastfd;
peer->lastfd = -1;
return (fd);
}