From: Christian Brauner Date: Tue, 27 Feb 2018 15:53:18 +0000 (+0100) Subject: console: lxc_terminal_set_stdfds() X-Git-Tag: lxc-3.0.0.beta1~5^2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae6d39133f89fbbf541c75ee268888cfcfbcc52b;p=thirdparty%2Flxc.git console: lxc_terminal_set_stdfds() Signed-off-by: Christian Brauner --- diff --git a/src/lxc/console.c b/src/lxc/console.c index 225f27445..00735e681 100644 --- a/src/lxc/console.c +++ b/src/lxc/console.c @@ -905,7 +905,7 @@ err: return -ENODEV; } -int lxc_console_set_stdfds(int fd) +int lxc_terminal_set_stdfds(int fd) { if (fd < 0) return 0; @@ -1122,7 +1122,7 @@ int lxc_login_pty(int fd) if (ret < 0) return -1; - ret = lxc_console_set_stdfds(fd); + ret = lxc_terminal_set_stdfds(fd); if (ret < 0) return -1; diff --git a/src/lxc/console.h b/src/lxc/console.h index 09b138778..2c3f675a8 100644 --- a/src/lxc/console.h +++ b/src/lxc/console.h @@ -148,7 +148,7 @@ extern int lxc_console_getfd(struct lxc_container *c, int *ttynum, * fd is made a duplicate of a specific standard file descriptor iff the * standard file descriptor refers to a pty. */ -extern int lxc_console_set_stdfds(int fd); +extern int lxc_terminal_set_stdfds(int fd); /* * Handler for events on the stdin fd of the pty. To be registered via the diff --git a/src/lxc/start.c b/src/lxc/start.c index 579da8cbe..ef87d136f 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -1205,7 +1205,7 @@ static int do_start(void *data) if (handler->backgrounded || handler->conf->is_execute == 0) ret = set_stdfds(handler->conf->console.slave); else - ret = lxc_console_set_stdfds(handler->conf->console.slave); + ret = lxc_terminal_set_stdfds(handler->conf->console.slave); if (ret < 0) { ERROR("Failed to redirect std{in,out,err} to pty file " "descriptor %d", handler->conf->console.slave);