X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fptyfwd.c;h=789f217efc88b4eb8fb8afd4dc7f59512247f5c0;hp=085d374ed873494105473adfffc6225455eccb46;hb=d8d5781c1eb031477670facc132e198f8fddd56c;hpb=56f64d95763a799ba4475daf44d8e9f72a1bd474 diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c index 085d374ed..789f217ef 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.c @@ -20,7 +20,6 @@ ***/ #include -#include #include #include #include @@ -42,6 +41,8 @@ struct PTYForward { struct termios saved_stdin_attr; struct termios saved_stdout_attr; + bool read_only:1; + bool saved_stdin:1; bool saved_stdout:1; @@ -53,6 +54,12 @@ struct PTYForward { bool master_writable:1; bool master_hangup:1; + /* Continue reading after hangup? */ + bool ignore_vhangup:1; + + bool last_char_set:1; + char last_char; + char in_buffer[LINE_MAX], out_buffer[LINE_MAX]; size_t in_buffer_full, out_buffer_full; @@ -166,14 +173,15 @@ static int shovel(PTYForward *f) { if (k < 0) { /* Note that EIO on the master device - * might be cause by vhangup() or + * might be caused by vhangup() or * temporary closing of everything on * the other side, we treat it like - * EAGAIN here and try again. */ + * EAGAIN here and try again, unless + * ignore_vhangup is off. */ - if (errno == EAGAIN || errno == EIO) + if (errno == EAGAIN || (errno == EIO && f->ignore_vhangup)) f->master_readable = false; - else if (errno == EPIPE || errno == ECONNRESET) { + else if (errno == EPIPE || errno == ECONNRESET || errno == EIO) { f->master_readable = f->master_writable = false; f->master_hangup = true; @@ -203,6 +211,12 @@ static int shovel(PTYForward *f) { } } else { + + if (k > 0) { + f->last_char = f->out_buffer[k-1]; + f->last_char_set = true; + } + assert(f->out_buffer_full >= (size_t) k); memmove(f->out_buffer, f->out_buffer + k, f->out_buffer_full - k); f->out_buffer_full -= k; @@ -280,12 +294,18 @@ static int on_sigwinch_event(sd_event_source *e, const struct signalfd_siginfo * /* The window size changed, let's forward that. */ if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0) - (void)ioctl(f->master, TIOCSWINSZ, &ws); + (void) ioctl(f->master, TIOCSWINSZ, &ws); return 0; } -int pty_forward_new(sd_event *event, int master, PTYForward **ret) { +int pty_forward_new( + sd_event *event, + int master, + bool ignore_vhangup, + bool read_only, + PTYForward **ret) { + _cleanup_(pty_forward_freep) PTYForward *f = NULL; struct winsize ws; int r; @@ -294,6 +314,9 @@ int pty_forward_new(sd_event *event, int master, PTYForward **ret) { if (!f) return -ENOMEM; + f->read_only = read_only; + f->ignore_vhangup = ignore_vhangup; + if (event) f->event = sd_event_ref(event); else { @@ -302,13 +325,15 @@ int pty_forward_new(sd_event *event, int master, PTYForward **ret) { return r; } - r = fd_nonblock(STDIN_FILENO, true); - if (r < 0) - return r; + if (!read_only) { + r = fd_nonblock(STDIN_FILENO, true); + if (r < 0) + return r; - r = fd_nonblock(STDOUT_FILENO, true); - if (r < 0) - return r; + r = fd_nonblock(STDOUT_FILENO, true); + if (r < 0) + return r; + } r = fd_nonblock(master, true); if (r < 0) @@ -317,38 +342,36 @@ int pty_forward_new(sd_event *event, int master, PTYForward **ret) { f->master = master; if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0) - (void)ioctl(master, TIOCSWINSZ, &ws); - - if (tcgetattr(STDIN_FILENO, &f->saved_stdin_attr) >= 0) { - struct termios raw_stdin_attr; + (void) ioctl(master, TIOCSWINSZ, &ws); - f->saved_stdin = true; + if (!read_only) { + if (tcgetattr(STDIN_FILENO, &f->saved_stdin_attr) >= 0) { + struct termios raw_stdin_attr; - raw_stdin_attr = f->saved_stdin_attr; - cfmakeraw(&raw_stdin_attr); - raw_stdin_attr.c_oflag = f->saved_stdin_attr.c_oflag; - tcsetattr(STDIN_FILENO, TCSANOW, &raw_stdin_attr); - } + f->saved_stdin = true; - if (tcgetattr(STDOUT_FILENO, &f->saved_stdout_attr) >= 0) { - struct termios raw_stdout_attr; + raw_stdin_attr = f->saved_stdin_attr; + cfmakeraw(&raw_stdin_attr); + raw_stdin_attr.c_oflag = f->saved_stdin_attr.c_oflag; + tcsetattr(STDIN_FILENO, TCSANOW, &raw_stdin_attr); + } - f->saved_stdout = true; + if (tcgetattr(STDOUT_FILENO, &f->saved_stdout_attr) >= 0) { + struct termios raw_stdout_attr; - raw_stdout_attr = f->saved_stdout_attr; - cfmakeraw(&raw_stdout_attr); - raw_stdout_attr.c_iflag = f->saved_stdout_attr.c_iflag; - raw_stdout_attr.c_lflag = f->saved_stdout_attr.c_lflag; - tcsetattr(STDOUT_FILENO, TCSANOW, &raw_stdout_attr); - } + f->saved_stdout = true; - r = sd_event_add_io(f->event, &f->master_event_source, master, EPOLLIN|EPOLLOUT|EPOLLET, on_master_event, f); - if (r < 0) - return r; + raw_stdout_attr = f->saved_stdout_attr; + cfmakeraw(&raw_stdout_attr); + raw_stdout_attr.c_iflag = f->saved_stdout_attr.c_iflag; + raw_stdout_attr.c_lflag = f->saved_stdout_attr.c_lflag; + tcsetattr(STDOUT_FILENO, TCSANOW, &raw_stdout_attr); + } - r = sd_event_add_io(f->event, &f->stdin_event_source, STDIN_FILENO, EPOLLIN|EPOLLET, on_stdin_event, f); - if (r < 0 && r != -EPERM) - return r; + r = sd_event_add_io(f->event, &f->stdin_event_source, STDIN_FILENO, EPOLLIN|EPOLLET, on_stdin_event, f); + if (r < 0 && r != -EPERM) + return r; + } r = sd_event_add_io(f->event, &f->stdout_event_source, STDOUT_FILENO, EPOLLOUT|EPOLLET, on_stdout_event, f); if (r == -EPERM) @@ -357,7 +380,13 @@ int pty_forward_new(sd_event *event, int master, PTYForward **ret) { else if (r < 0) return r; + r = sd_event_add_io(f->event, &f->master_event_source, master, EPOLLIN|EPOLLOUT|EPOLLET, on_master_event, f); + if (r < 0) + return r; + r = sd_event_add_signal(f->event, &f->sigwinch_event_source, SIGWINCH, on_sigwinch_event, f); + if (r < 0) + return r; *ret = f; f = NULL; @@ -388,3 +417,43 @@ PTYForward *pty_forward_free(PTYForward *f) { return NULL; } + +int pty_forward_get_last_char(PTYForward *f, char *ch) { + assert(f); + assert(ch); + + if (!f->last_char_set) + return -ENXIO; + + *ch = f->last_char; + return 0; +} + +int pty_forward_set_ignore_vhangup(PTYForward *f, bool ignore_vhangup) { + int r; + + assert(f); + + if (f->ignore_vhangup == ignore_vhangup) + return 0; + + f->ignore_vhangup = ignore_vhangup; + if (!f->ignore_vhangup) { + + /* We shall now react to vhangup()s? Let's check + * immediately if we might be in one */ + + f->master_readable = true; + r = shovel(f); + if (r < 0) + return r; + } + + return 0; +} + +int pty_forward_get_ignore_vhangup(PTYForward *f) { + assert(f); + + return f->ignore_vhangup; +}