From 077a9ec3311d0f31d272f71bb0a99dfd5d8102a1 Mon Sep 17 00:00:00 2001 From: cel Date: Sun, 16 Dec 2018 18:39:24 -1000 Subject: [PATCH] Make -r imply -l Raw mode with newline insertion doesn't make sense --- sbotc.1 | 3 ++- sbotc.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sbotc.1 b/sbotc.1 index a785173..1c12004 100644 --- a/sbotc.1 +++ b/sbotc.1 @@ -50,7 +50,8 @@ Send stdin data as JSON. .It Fl l Don't output newlines after string or JSON packets. .It Fl r -Raw mode. Disables stdin line buffering/editing and echoing. +Raw mode. Disables stdin line buffering/editing and echoing. Implies +.Fl l . .It Fl T Test using shs1-testsuite protocol. Instead of connecting to a server and running a command, connect to stdio. On successful handshake, output concatenation of diff --git a/sbotc.c b/sbotc.c index c95a43a..579e021 100644 --- a/sbotc.c +++ b/sbotc.c @@ -1000,7 +1000,7 @@ int main(int argc, char *argv[]) { case '6': ipv6_arg = true; break; case 'a': passthrough = true; break; case 'l': no_newline = true; break; - case 'r': raw = true; break; + case 'r': raw = true; no_newline = true; break; default: usage(); } }