circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't return 1 unless there was actually a problem (signal/lost server) rather 

than for all events (normal exit/detach/etc).
pull/1/head
Nicholas Marriott 2009-11-10 15:47:48 +00:00
parent 6609093625
commit 9f47c6083a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client.c
View File

@ -37,6 +37,7 @@
struct imsgbuf client_ibuf; struct imsgbuf client_ibuf;
struct event client_event; struct event client_event;
const char *client_exitmsg; const char *client_exitmsg;
int client_exitval;
void client_send_identify(int); void client_send_identify(int);
void client_send_environ(void); void client_send_environ(void);
@ -211,17 +212,14 @@ client_main(void)
goto out; goto out;
/* Set the event and dispatch. */ /* Set the event and dispatch. */
client_update_event(); client_update_event();
event_dispatch(); event_dispatch();
out: out:
/* Print the exit message, if any, and exit. */ /* Print the exit message, if any, and exit. */
if (client_exitmsg != NULL) { if (client_exitmsg != NULL && !login_shell)
if (!login_shell) printf("[%s]\n", client_exitmsg);
printf("[%s]\n", client_exitmsg); exit(client_exitval);
exit(1);
}
exit(0);
} }
void void
@ -232,6 +230,7 @@ client_signal(int sig, unused short events, unused void *data)
switch (sig) { switch (sig) {
case SIGTERM: case SIGTERM:
client_exitmsg = "terminated"; client_exitmsg = "terminated";
client_exitval = 1;
client_write_server(MSG_EXITING, NULL, 0); client_write_server(MSG_EXITING, NULL, 0);
break; break;
case SIGWINCH: case SIGWINCH:
@ -275,6 +274,7 @@ client_callback(unused int fd, short events, unused void *data)
lost_server: lost_server:
client_exitmsg = "lost server"; client_exitmsg = "lost server";
client_exitval = 1;
event_loopexit(NULL); event_loopexit(NULL);
} }
@ -321,6 +321,7 @@ client_dispatch(void)
client_write_server(MSG_EXITING, NULL, 0); client_write_server(MSG_EXITING, NULL, 0);
client_exitmsg = "server exited"; client_exitmsg = "server exited";
client_exitval = 1;
break; break;
case MSG_SUSPEND: case MSG_SUSPEND:
if (datalen != 0) if (datalen != 0)