terminal: lxc_make_controlling_terminal()

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 243c91c653a54e27931dce574b09a15932ba419e..04ff172cddbaf2754a8abd63ba8226e1472c5d80 100644 (file)
--- 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)) {
        }
 
        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;
        }
                if (ret < 0)
                        goto on_error;
        }

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index a695dff65b49cdc978226a0f5ae806b5f52ff313..58fcdce4b56305c9240e7d124f9b8831bfbe1e64 100644 (file)
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -1131,7 +1131,7 @@ close_fds:
        return ret;
 }
 
        return ret;
 }
 

-int lxc_make_controlling_pty(int fd)
+int lxc_make_controlling_terminal(int fd)

 {
        int ret;
 
 {
        int ret;
 


@@ -1148,7 +1148,7 @@ int lxc_login_pty(int fd)
 {
        int ret;
 
 {
        int ret;
 

-       ret = lxc_make_controlling_pty(fd);
+       ret = lxc_make_controlling_terminal(fd);

        if (ret < 0)
                return -1;
 
        if (ret < 0)
                return -1;
 

diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
index e9b95c434012a5e5af282ec68d87fea3ef4cc90f..79ee4a1d1c925193bc95979d4ce252a43071c14e 100644 (file)
--- 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_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);
 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);