From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 27 Feb 2018 15:09:32 +0000 (+0100)
Subject: console: lxc_terminal_winsz()
X-Git-Tag: lxc-3.0.0.beta1~5^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e9c033073d292fc4759eb46e958ad7e29cded89;p=thirdparty%2Flxc.git

console: lxc_terminal_winsz()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 618421439..abec22a67 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -64,7 +64,7 @@ __attribute__((constructor)) void lxc_console_init(void)
 	lxc_list_init(&lxc_ttys);
 }
 
-void lxc_console_winsz(int srcfd, int dstfd)
+void lxc_terminal_winsz(int srcfd, int dstfd)
 {
 	int ret;
 	struct winsize wsz;
@@ -90,7 +90,7 @@ void lxc_console_winsz(int srcfd, int dstfd)
 
 static void lxc_console_winch(struct lxc_tty_state *ts)
 {
-	lxc_console_winsz(ts->stdinfd, ts->masterfd);
+	lxc_terminal_winsz(ts->stdinfd, ts->masterfd);
 
 	if (ts->winch_proxy)
 		lxc_cmd_console_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
@@ -677,7 +677,7 @@ static int lxc_console_peer_default(struct lxc_pty *console)
 		goto on_error1;
 	}
 
-	lxc_console_winsz(console->peer, console->master);
+	lxc_terminal_winsz(console->peer, console->master);
 
 	console->tios = malloc(sizeof(*console->tios));
 	if (!console->tios) {
@@ -1022,7 +1022,7 @@ int lxc_console(struct lxc_container *c, int ttynum,
 
 	istty = isatty(stdinfd);
 	if (istty) {
-		lxc_console_winsz(stdinfd, masterfd);
+		lxc_terminal_winsz(stdinfd, masterfd);
 		lxc_cmd_console_winch(ts->winch_proxy, ts->winch_proxy_lxcpath);
 	} else {
 		INFO("File descriptor %d does not refer to a tty device", stdinfd);
diff --git a/src/lxc/console.h b/src/lxc/console.h
index f3a3b6f3e..6e10da91c 100644
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -176,12 +176,12 @@ extern int lxc_setup_tios(int fd, struct termios *oldtios);
 
 
 /*
- * lxc_console_winsz: propagte winsz from one terminal to another
+ * lxc_terminal_winsz: propagate winsz from one terminal to another
  *
  * @srcfd : terminal to get size from (typically a slave pty)
  * @dstfd : terminal to set size on (typically a master pty)
  */
-extern void lxc_console_winsz(int srcfd, int dstfd);
+extern void lxc_terminal_winsz(int srcfd, int dstfd);
 
 /*
  * lxc_console_signal_init: install signal handler