From cd0a2b2f0bd0fbc16c3b40b96ab5c4c7a7e29426 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 28 Feb 2018 12:46:36 +0100 Subject: [PATCH] terminal: lxc_make_controlling_terminal() Signed-off-by: Christian Brauner --- src/lxc/attach.c | 2 +- src/lxc/terminal.c | 4 ++-- src/lxc/terminal.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lxc/attach.c b/src/lxc/attach.c index 243c91c65..04ff172cd 100644 --- a/src/lxc/attach.c +++ b/src/lxc/attach.c @@ -846,7 +846,7 @@ static int attach_child_main(struct attach_clone_payload *payload) } if (options->stdin_fd > 0 && isatty(options->stdin_fd)) { - ret = lxc_make_controlling_pty(options->stdin_fd); + ret = lxc_make_controlling_terminal(options->stdin_fd); if (ret < 0) goto on_error; } diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c index a695dff65..58fcdce4b 100644 --- a/src/lxc/terminal.c +++ b/src/lxc/terminal.c @@ -1131,7 +1131,7 @@ close_fds: return ret; } -int lxc_make_controlling_pty(int fd) +int lxc_make_controlling_terminal(int fd) { int ret; @@ -1148,7 +1148,7 @@ int lxc_login_pty(int fd) { int ret; - ret = lxc_make_controlling_pty(fd); + ret = lxc_make_controlling_terminal(fd); if (ret < 0) return -1; diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h index e9b95c434..79ee4a1d1 100644 --- a/src/lxc/terminal.h +++ b/src/lxc/terminal.h @@ -281,7 +281,7 @@ extern int lxc_terminal_create_log_file(struct lxc_terminal *console); extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data, struct lxc_epoll_descr *descr); -extern int lxc_make_controlling_pty(int fd); +extern int lxc_make_controlling_terminal(int fd); extern int lxc_login_pty(int fd); extern void lxc_terminal_conf_free(struct lxc_terminal *console); extern void lxc_terminal_info_init(struct lxc_terminal_info *pty);