mirror of
https://github.com/tmate-io/tmate.git
synced 2025-08-16 08:38:12 +02:00
Add a -P option to detach to HUP the client's parent process (usually
causing it to exit as well).
This commit is contained in:
19
client.c
19
client.c
@ -36,6 +36,7 @@ struct imsgbuf client_ibuf;
|
||||
struct event client_event;
|
||||
const char *client_exitmsg;
|
||||
int client_exitval;
|
||||
enum msgtype client_exittype;
|
||||
int client_attached;
|
||||
|
||||
int client_connect(char *, int);
|
||||
@ -100,6 +101,7 @@ client_main(int argc, char **argv, int flags)
|
||||
struct cmd_list *cmdlist;
|
||||
struct msg_command_data cmddata;
|
||||
int cmdflags, fd;
|
||||
pid_t ppid;
|
||||
enum msgtype msg;
|
||||
char *cause;
|
||||
|
||||
@ -192,8 +194,14 @@ client_main(int argc, char **argv, int flags)
|
||||
event_dispatch();
|
||||
|
||||
/* Print the exit message, if any, and exit. */
|
||||
if (client_attached && client_exitmsg != NULL && !login_shell)
|
||||
printf("[%s]\n", client_exitmsg);
|
||||
if (client_attached) {
|
||||
if (client_exitmsg != NULL && !login_shell)
|
||||
printf("[%s]\n", client_exitmsg);
|
||||
|
||||
ppid = getppid();
|
||||
if (client_exittype == MSG_DETACHKILL && ppid > 1)
|
||||
kill(ppid, SIGHUP);
|
||||
}
|
||||
return (client_exitval);
|
||||
}
|
||||
|
||||
@ -434,12 +442,17 @@ client_dispatch_attached(void)
|
||||
|
||||
log_debug("client got %d", imsg.hdr.type);
|
||||
switch (imsg.hdr.type) {
|
||||
case MSG_DETACHKILL:
|
||||
case MSG_DETACH:
|
||||
if (datalen != 0)
|
||||
fatalx("bad MSG_DETACH size");
|
||||
|
||||
client_exittype = imsg.hdr.type;
|
||||
if (imsg.hdr.type == MSG_DETACHKILL)
|
||||
client_exitmsg = "detached and SIGHUP";
|
||||
else
|
||||
client_exitmsg = "detached";
|
||||
client_write_server(MSG_EXITING, NULL, 0);
|
||||
client_exitmsg = "detached";
|
||||
break;
|
||||
case MSG_EXIT:
|
||||
if (datalen != 0 &&
|
||||
|
Reference in New Issue
Block a user