New lock-client and lock-session commands to lock an individual client or all

clients attached to a session respectively.

1 files changed, 36 insertions, 13 deletions

diff --git a/server-fn.c b/server-fn.c
index b9be1794..6acca2bf 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -157,10 +157,8 @@ server_status_window(struct window *w)
 void
 server_lock(void)
 {
-	struct client		*c;
-	const char		*cmd;
-	struct msg_lock_data	 lockdata;
-	u_int			 i;
+	struct client	*c;
+	u_int		 i;
 
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
@@ -168,19 +166,44 @@ server_lock(void)
 			continue;
 		if (c->flags & CLIENT_SUSPENDED)
 			continue;
+		server_lock_client(c);
+	}
+}
 
-		cmd = options_get_string(&c->session->options, "lock-command");
-		if (strlcpy(lockdata.cmd, 
-		    cmd, sizeof lockdata.cmd) >= sizeof lockdata.cmd)
+void
+server_lock_session(struct session *s)
+{
+	struct client	*c;
+	u_int		 i;
+
+	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
+		c = ARRAY_ITEM(&clients, i);
+		if (c == NULL || c->session == NULL || c->session != s)
+			continue;
+		if (c->flags & CLIENT_SUSPENDED)
 			continue;
+		server_lock_client(c);
+	}	
+}
 
-		tty_stop_tty(&c->tty);
-		tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_SMCUP));
-		tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_CLEAR));
+void
+server_lock_client(struct client *c)
+{
+	const char		*cmd;
+	size_t			 cmdlen;
+	struct msg_lock_data	 lockdata;
 
-		c->flags |= CLIENT_SUSPENDED;
-		server_write_client(c, MSG_LOCK, &lockdata, sizeof lockdata);
-	}
+	cmd = options_get_string(&c->session->options, "lock-command");
+	cmdlen = strlcpy(lockdata.cmd, cmd, sizeof lockdata.cmd);
+	if (cmdlen >= sizeof lockdata.cmd)
+		return;
+      
+	tty_stop_tty(&c->tty);
+	tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_SMCUP));
+	tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_CLEAR));
+
+	c->flags |= CLIENT_SUSPENDED;
+	server_write_client(c, MSG_LOCK, &lockdata, sizeof lockdata);
 }
 
 void