From: Christian Brauner Date: Tue, 27 Feb 2018 15:12:51 +0000 (+0100) Subject: console: lxc_terminal_sigwinch() X-Git-Tag: lxc-3.0.0.beta1~5^2~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dad4a0390d48930245333bad00667e6cab66a7c3;p=thirdparty%2Flxc.git console: lxc_terminal_sigwinch() Signed-off-by: Christian Brauner --- diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 92363fa87..53b0318a4 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -685,7 +685,7 @@ static int lxc_cmd_console_winch_callback(int fd, struct lxc_cmd_req *req, { struct lxc_cmd_rsp rsp = { .data = 0 }; - lxc_console_sigwinch(SIGWINCH); + lxc_terminal_sigwinch(SIGWINCH); return lxc_cmd_rsp_send(fd, &rsp); } diff --git a/src/lxc/console.c b/src/lxc/console.c index a5a050203..624f3df78 100644 --- a/src/lxc/console.c +++ b/src/lxc/console.c @@ -96,7 +96,7 @@ static void lxc_terminal_winch(struct lxc_tty_state *ts) lxc_cmd_console_winch(ts->winch_proxy, ts->winch_proxy_lxcpath); } -void lxc_console_sigwinch(int sig) +void lxc_terminal_sigwinch(int sig) { struct lxc_list *it; struct lxc_tty_state *ts; diff --git a/src/lxc/console.h b/src/lxc/console.h index 6e10da91c..82b5fb937 100644 --- a/src/lxc/console.h +++ b/src/lxc/console.h @@ -119,7 +119,7 @@ extern int lxc_console_mainloop_add(struct lxc_epoll_descr *, struct lxc_pty *) /* * Handle SIGWINCH events on the allocated ptys. */ -extern void lxc_console_sigwinch(int sig); +extern void lxc_terminal_sigwinch(int sig); /* * Connect to one of the ptys given to the container via lxc.tty.max. @@ -199,7 +199,7 @@ extern void lxc_terminal_winsz(int srcfd, int dstfd); * Note that the signal handler isn't installed as a classic asychronous * handler, rather signalfd(2) is used so that we can handle the signal when * we're ready for it. This avoids deadlocks since a signal handler (ie - * lxc_console_sigwinch()) would need to take the thread mutex to prevent + * lxc_terminal_sigwinch()) would need to take the thread mutex to prevent * lxc_ttys list corruption, but using the fd we can provide the tty_state * needed to the callback (lxc_console_cb_signal_fd()). *