diff --git a/client.c b/client.c index ac49f43..5bd7f0e 100644 --- a/client.c +++ b/client.c @@ -101,8 +101,7 @@ static int client_mainloop(void) { if (client_recv_packet(&pkt)) { switch (pkt.type) { case MSG_CONTENT: - if (!passthrough) - write_all(STDOUT_FILENO, pkt.u.msg, pkt.len); + write_all(STDOUT_FILENO, pkt.u.msg, pkt.len); break; case MSG_RESIZE: client.need_resize = true; diff --git a/splex.c b/splex.c index 4e5ccab..57bbdb2 100644 --- a/splex.c +++ b/splex.c @@ -122,7 +122,7 @@ typedef struct { static Server server = { .running = true, .exit_status = -1, .host = "@localhost" }; static Client client; static struct termios orig_term, cur_term; -static bool has_term, alternate_buffer, quiet, passthrough; +static bool has_term, alternate_buffer, quiet; static struct sockaddr_un sockaddr = { .sun_family = AF_UNIX, @@ -603,7 +603,7 @@ int main(int argc, char *argv[]) { server.name = basename(argv[0]); gethostname(server.host+1, sizeof(server.host) - 1); - while ((opt = getopt(argc, argv, "aAclne:fpqrv")) != -1) { + while ((opt = getopt(argc, argv, "aAclne:fqrv")) != -1) { switch (opt) { case 'a': case 'A': @@ -621,9 +621,6 @@ int main(int argc, char *argv[]) { case 'f': force = true; break; - case 'p': - passthrough = true; - break; case 'q': quiet = true; break; @@ -634,7 +631,7 @@ int main(int argc, char *argv[]) { client.flags |= CLIENT_LOWPRIORITY; break; case 'v': - puts("abduco-"VERSION" © 2013-2018 Marc André Tanner"); + puts("splex-0.1, based on abduco-"VERSION" by Marc André Tanner"); exit(EXIT_SUCCESS); default: usage(); @@ -651,22 +648,15 @@ int main(int argc, char *argv[]) { else cmd = default_cmd; - if (server.session_name && !isatty(STDIN_FILENO)) - passthrough = true; - - if (passthrough) { - if (!action) - action = 'a'; - quiet = true; - client.flags |= CLIENT_LOWPRIORITY; - } + if (!isatty(STDIN_FILENO)) + die("STDIN is not a tty"); if (!action && !server.session_name) exit(list_session()); if (!action || !server.session_name) usage(); - if (!passthrough && tcgetattr(STDIN_FILENO, &orig_term) != -1) { + if (tcgetattr(STDIN_FILENO, &orig_term) != -1) { server.term = orig_term; has_term = true; }