# HG changeset patch # User Matt Johnston # Date 1633936422 -28800 # Node ID eaa2d7240a5daffb44cacb7c04b3c1ae38a27c53 # Parent 7a0068effc65c9f2a44a5723d94da205fb542044 Move comment to svr_chansess_checksignal() where it belongs diff -r 7a0068effc65 -r eaa2d7240a5d svr-chansession.c --- a/svr-chansession.c Mon Oct 11 15:12:22 2021 +0800 +++ b/svr-chansession.c Mon Oct 11 15:13:42 2021 +0800 @@ -82,6 +82,14 @@ return chansess->exit.exitpid != -1; } +/* Handler for childs exiting, store the state for return to the client */ + +/* There's a particular race we have to watch out for: if the forked child + * executes, exits, and this signal-handler is called, all before the parent + * gets to run, then the childpids[] array won't have the pid in it. Hence we + * use the svr_ses.lastexit struct to hold the exit, which is then compared by + * the parent when it runs. This work correctly at least in the case of a + * single shell spawned (ie the usual case) */ void svr_chansess_checksignal(void) { int status; pid_t pid; @@ -127,18 +135,9 @@ /* we use this to determine how pid exited */ ex->exitsignal = -1; } - } } -/* Handler for childs exiting, store the state for return to the client */ - -/* There's a particular race we have to watch out for: if the forked child - * executes, exits, and this signal-handler is called, all before the parent - * gets to run, then the childpids[] array won't have the pid in it. Hence we - * use the svr_ses.lastexit struct to hold the exit, which is then compared by - * the parent when it runs. This work correctly at least in the case of a - * single shell spawned (ie the usual case) */ static void sesssigchild_handler(int UNUSED(dummy)) { struct sigaction sa_chld;