From 9785b5398c7cd71e97e19cebaf778bd01ebae272 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 27 Feb 2018 15:57:31 +0100 Subject: [PATCH] tree-wide: s/struct lxc_console/struct lxc_pty/g Signed-off-by: Christian Brauner --- src/lxc/attach.c | 14 +++++++------- src/lxc/conf.c | 6 +++--- src/lxc/conf.h | 6 +++--- src/lxc/console.c | 40 ++++++++++++++++++++-------------------- src/lxc/console.h | 15 ++++++++------- src/lxc/start.c | 2 +- 6 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/lxc/attach.c b/src/lxc/attach.c index 28c2cadfd..58e17fb6a 100644 --- a/src/lxc/attach.c +++ b/src/lxc/attach.c @@ -974,7 +974,7 @@ on_error: rexit(EXIT_FAILURE); } -static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_console *pty) +static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty) { int ret; @@ -1001,7 +1001,7 @@ on_error: return -1; } -static int lxc_attach_pty_mainloop_init(struct lxc_console *pty, +static int lxc_attach_pty_mainloop_init(struct lxc_pty *pty, struct lxc_epoll_descr *descr) { int ret; @@ -1022,7 +1022,7 @@ static int lxc_attach_pty_mainloop_init(struct lxc_console *pty, return 0; } -static inline void lxc_attach_pty_close_master(struct lxc_console *pty) +static inline void lxc_attach_pty_close_master(struct lxc_pty *pty) { if (pty->master < 0) return; @@ -1031,7 +1031,7 @@ static inline void lxc_attach_pty_close_master(struct lxc_console *pty) pty->master = -EBADF; } -static inline void lxc_attach_pty_close_slave(struct lxc_console *pty) +static inline void lxc_attach_pty_close_slave(struct lxc_pty *pty) { if (pty->slave < 0) return; @@ -1040,7 +1040,7 @@ static inline void lxc_attach_pty_close_slave(struct lxc_console *pty) pty->slave = -EBADF; } -static inline void lxc_attach_pty_close_peer(struct lxc_console *pty) +static inline void lxc_attach_pty_close_peer(struct lxc_pty *pty) { if (pty->peer < 0) return; @@ -1049,7 +1049,7 @@ static inline void lxc_attach_pty_close_peer(struct lxc_console *pty) pty->peer = -EBADF; } -static inline void lxc_attach_pty_close_log(struct lxc_console *pty) +static inline void lxc_attach_pty_close_log(struct lxc_pty *pty) { if (pty->log_fd < 0) return; @@ -1068,7 +1068,7 @@ int lxc_attach(const char *name, const char *lxcpath, signed long personality; pid_t attached_pid, init_pid, pid; struct lxc_proc_context_info *init_ctx; - struct lxc_console pty; + struct lxc_pty pty; struct lxc_conf *conf; struct attach_clone_payload payload = {0}; diff --git a/src/lxc/conf.c b/src/lxc/conf.c index e1cca7597..27e646e2a 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -1578,7 +1578,7 @@ static int setup_personality(int persona) } static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs, - const struct lxc_console *console) + const struct lxc_pty *console) { char path[MAXPATHLEN]; int ret, fd; @@ -1634,7 +1634,7 @@ static int lxc_setup_dev_console(const struct lxc_rootfs *rootfs, } static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs, - const struct lxc_console *console, + const struct lxc_pty *console, char *ttydir) { int ret, fd; @@ -1720,7 +1720,7 @@ static int lxc_setup_ttydir_console(const struct lxc_rootfs *rootfs, } static int lxc_setup_console(const struct lxc_rootfs *rootfs, - const struct lxc_console *console, char *ttydir) + const struct lxc_pty *console, char *ttydir) { if (!ttydir) diff --git a/src/lxc/conf.h b/src/lxc/conf.h index d554b5f24..8a521fe80 100644 --- a/src/lxc/conf.h +++ b/src/lxc/conf.h @@ -164,7 +164,7 @@ struct lxc_tty_state; * @peer : the file descriptor put/get console traffic * @name : the file name of the slave pty */ -struct lxc_console { +struct lxc_pty { int slave; int master; int peer; @@ -189,7 +189,7 @@ struct lxc_console { unsigned int log_rotate; }; - struct /* lxc_console_ringbuf */ { + struct /* lxc_pty_ringbuf */ { /* size of the ringbuffer */ uint64_t buffer_size; @@ -314,7 +314,7 @@ struct lxc_conf { struct lxc_tty_info tty_info; /* Comma-separated list of lxc.tty.max pty names. */ char *pty_names; - struct lxc_console console; + struct lxc_pty console; struct lxc_rootfs rootfs; char *ttydir; int close_all_fds; diff --git a/src/lxc/console.c b/src/lxc/console.c index a893aba07..618421439 100644 --- a/src/lxc/console.c +++ b/src/lxc/console.c @@ -204,7 +204,7 @@ void lxc_console_signal_fini(struct lxc_tty_state *ts) free(ts); } -static int lxc_console_truncate_log_file(struct lxc_console *console) +static int lxc_console_truncate_log_file(struct lxc_pty *console) { /* be very certain things are kosher */ if (!console->log_path || console->log_fd < 0) @@ -213,7 +213,7 @@ static int lxc_console_truncate_log_file(struct lxc_console *console) return lxc_unpriv(ftruncate(console->log_fd, 0)); } -static int lxc_console_rotate_log_file(struct lxc_console *console) +static int lxc_console_rotate_log_file(struct lxc_pty *console) { int ret; size_t len; @@ -242,7 +242,7 @@ static int lxc_console_rotate_log_file(struct lxc_console *console) return lxc_console_create_log_file(console); } -static int lxc_console_write_log_file(struct lxc_console *console, char *buf, +static int lxc_console_write_log_file(struct lxc_pty *console, char *buf, int bytes_read) { int ret; @@ -351,7 +351,7 @@ static int lxc_console_write_log_file(struct lxc_console *console, char *buf, int lxc_console_cb_con(int fd, uint32_t events, void *data, struct lxc_epoll_descr *descr) { - struct lxc_console *console = (struct lxc_console *)data; + struct lxc_pty *console = data; char buf[LXC_CONSOLE_BUFFER_SIZE]; int r, w, w_log, w_rbuf; @@ -407,7 +407,7 @@ int lxc_console_cb_con(int fd, uint32_t events, void *data, return 0; } -static int lxc_console_mainloop_add_peer(struct lxc_console *console) +static int lxc_console_mainloop_add_peer(struct lxc_pty *console) { int ret; @@ -434,7 +434,7 @@ static int lxc_console_mainloop_add_peer(struct lxc_console *console) } int lxc_console_mainloop_add(struct lxc_epoll_descr *descr, - struct lxc_console *console) + struct lxc_pty *console) { int ret; @@ -509,7 +509,7 @@ int lxc_setup_tios(int fd, struct termios *oldtios) return 0; } -static void lxc_console_peer_proxy_free(struct lxc_console *console) +static void lxc_console_peer_proxy_free(struct lxc_pty *console) { if (console->tty_state) { lxc_console_signal_fini(console->tty_state); @@ -524,7 +524,7 @@ static void lxc_console_peer_proxy_free(struct lxc_console *console) console->peer = -1; } -static int lxc_console_peer_proxy_alloc(struct lxc_console *console, int sockfd) +static int lxc_console_peer_proxy_alloc(struct lxc_pty *console, int sockfd) { struct termios oldtermio; struct lxc_tty_state *ts; @@ -579,7 +579,7 @@ int lxc_console_allocate(struct lxc_conf *conf, int sockfd, int *ttyreq) { int masterfd = -1, ttynum; struct lxc_tty_info *tty_info = &conf->tty_info; - struct lxc_console *console = &conf->console; + struct lxc_pty *console = &conf->console; if (*ttyreq == 0) { if (lxc_console_peer_proxy_alloc(console, sockfd) < 0) @@ -621,7 +621,7 @@ void lxc_console_free(struct lxc_conf *conf, int fd) { int i; struct lxc_tty_info *tty_info = &conf->tty_info; - struct lxc_console *console = &conf->console; + struct lxc_pty *console = &conf->console; for (i = 0; i < tty_info->nbtty; i++) { if (tty_info->pty_info[i].busy == fd) @@ -634,7 +634,7 @@ void lxc_console_free(struct lxc_conf *conf, int fd) } } -static int lxc_console_peer_default(struct lxc_console *console) +static int lxc_console_peer_default(struct lxc_pty *console) { struct lxc_tty_state *ts; const char *path = console->path; @@ -703,7 +703,7 @@ out: return ret; } -int lxc_console_write_ringbuffer(struct lxc_console *console) +int lxc_console_write_ringbuffer(struct lxc_pty *console) { char *r_addr; ssize_t ret; @@ -738,7 +738,7 @@ int lxc_console_write_ringbuffer(struct lxc_console *console) return 0; } -void lxc_console_delete(struct lxc_console *console) +void lxc_console_delete(struct lxc_pty *console) { int ret; @@ -776,7 +776,7 @@ void lxc_console_delete(struct lxc_console *console) * register a handler for the console's masterfd when we create the mainloop * the console handler needs to see an allocated ringbuffer. */ -static int lxc_console_create_ringbuf(struct lxc_console *console) +static int lxc_console_create_ringbuf(struct lxc_pty *console) { int ret; struct lxc_ringbuf *buf = &console->ringbuf; @@ -822,7 +822,7 @@ static int lxc_console_create_ringbuf(struct lxc_console *console) * This is the console log file. Please note that the console log file is * (implementation wise not content wise) independent of the console ringbuffer. */ -int lxc_console_create_log_file(struct lxc_console *console) +int lxc_console_create_log_file(struct lxc_pty *console) { if (!console->log_path) return 0; @@ -837,7 +837,7 @@ int lxc_console_create_log_file(struct lxc_console *console) return 0; } -int lxc_pty_create(struct lxc_console *console) +int lxc_pty_create(struct lxc_pty *console) { int ret, saved_errno; @@ -877,7 +877,7 @@ err: int lxc_console_create(struct lxc_conf *conf) { int ret; - struct lxc_console *console = &conf->console; + struct lxc_pty *console = &conf->console; if (console->path && !strcmp(console->path, "none")) { INFO("No console was requested"); @@ -1140,7 +1140,7 @@ void lxc_pty_info_init(struct lxc_pty_info *pty) pty->busy = -1; } -void lxc_pty_init(struct lxc_console *pty) +void lxc_pty_init(struct lxc_pty *pty) { memset(pty, 0, sizeof(*pty)); pty->slave = -EBADF; @@ -1150,7 +1150,7 @@ void lxc_pty_init(struct lxc_console *pty) lxc_pty_info_init(&pty->peerpty); } -void lxc_pty_conf_free(struct lxc_console *console) +void lxc_pty_conf_free(struct lxc_pty *console) { free(console->log_path); free(console->path); @@ -1158,7 +1158,7 @@ void lxc_pty_conf_free(struct lxc_console *console) lxc_ringbuf_release(&console->ringbuf); } -int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_console *pty) +int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty) { int ret; diff --git a/src/lxc/console.h b/src/lxc/console.h index e6e323ed0..f3a3b6f3e 100644 --- a/src/lxc/console.h +++ b/src/lxc/console.h @@ -82,7 +82,7 @@ extern int lxc_console_allocate(struct lxc_conf *conf, int sockfd, int *ttynum) * automatically chowned to the uid/gid of the unprivileged user. For this * ttys_shift_ids() can be called.) */ -extern int lxc_pty_create(struct lxc_console *console); +extern int lxc_pty_create(struct lxc_pty *console); /** * lxc_console_create: Create a new pty. @@ -98,7 +98,7 @@ extern int lxc_console_create(struct lxc_conf *); * /dev/tty) * Registered handlers in a mainloop are not automatically deleted. */ -extern void lxc_console_delete(struct lxc_console *); +extern void lxc_console_delete(struct lxc_pty *); /* * lxc_console_free: mark the console or a tty as unallocated, free any @@ -114,7 +114,7 @@ extern void lxc_console_free(struct lxc_conf *conf, int fd); /* * Register pty event handlers in an open mainloop */ -extern int lxc_console_mainloop_add(struct lxc_epoll_descr *, struct lxc_console *); +extern int lxc_console_mainloop_add(struct lxc_epoll_descr *, struct lxc_pty *); /* * Handle SIGWINCH events on the allocated ptys. @@ -227,15 +227,16 @@ extern int lxc_console_cb_signal_fd(int fd, uint32_t events, void *cbdata, */ extern void lxc_console_signal_fini(struct lxc_tty_state *ts); -extern int lxc_console_create_log_file(struct lxc_console *console); +extern int lxc_console_write_ringbuffer(struct lxc_pty *console); +extern int lxc_console_create_log_file(struct lxc_pty *console); extern int lxc_console_cb_con(int fd, uint32_t events, void *data, struct lxc_epoll_descr *descr); extern int lxc_make_controlling_pty(int fd); extern int lxc_login_pty(int fd); -extern void lxc_pty_conf_free(struct lxc_console *console); +extern void lxc_pty_conf_free(struct lxc_pty *console); extern void lxc_pty_info_init(struct lxc_pty_info *pty); -extern void lxc_pty_init(struct lxc_console *pty); -extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_console *pty); +extern void lxc_pty_init(struct lxc_pty *pty); +extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty); #endif diff --git a/src/lxc/start.c b/src/lxc/start.c index 5438ebda0..ebcd0c272 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -529,7 +529,7 @@ int lxc_poll(const char *name, struct lxc_handler *handler) } if (has_console) { - struct lxc_console *console = &handler->conf->console; + struct lxc_pty *console = &handler->conf->console; ret = lxc_console_mainloop_add(&descr, console); if (ret < 0) { -- 2.39.2