From d461751a7140491e4c284c78df860e2cc2c6c288 Mon Sep 17 00:00:00 2001 From: Wes Koerber Date: Thu, 13 Jul 2023 20:49:53 -0400 Subject: [PATCH 1/3] fix: support --log-append in cli options fixes: #199 --- src/options.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/options.c b/src/options.c index 6217cc4..9c0908c 100644 --- a/src/options.c +++ b/src/options.c @@ -46,6 +46,7 @@ enum opt_t OPT_TIMESTAMP_FORMAT, OPT_LOG_FILE, OPT_LOG_STRIP, + OPT_LOG_APPEND, OPT_LINE_PULSE_DURATION, OPT_RESPONSE_TIMEOUT, OPT_RS485, @@ -254,6 +255,7 @@ void options_parse(int argc, char *argv[]) {"log", no_argument, 0, 'l' }, {"log-file", required_argument, 0, OPT_LOG_FILE }, {"log-strip", no_argument, 0, OPT_LOG_STRIP }, + {"log-append", no_argument, 0, OPT_LOG_APPEND }, {"socket", required_argument, 0, 'S' }, {"map", required_argument, 0, 'm' }, {"color", required_argument, 0, 'c' }, @@ -357,6 +359,10 @@ void options_parse(int argc, char *argv[]) option.log_strip = true; break; + case OPT_LOG_APPEND: + option.log_append = true; + break; + case 'S': option.socket = optarg; break; From 5656381cc3e984a4307fa9fe5970ceeac3e5948d Mon Sep 17 00:00:00 2001 From: Wes Koerber Date: Thu, 13 Jul 2023 20:58:01 -0400 Subject: [PATCH 2/3] chore: update readme, bash completion, man page --- README.md | 1 + man/tio.1.in | 2 ++ man/tio.1.txt | 2 ++ src/bash-completion/tio.in | 5 +++++ 4 files changed, 10 insertions(+) diff --git a/README.md b/README.md index c935cf9..0d119d5 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ The command-line interface is straightforward as reflected in the output from -L, --list-devices List available serial devices -l, --log Enable log to file --log-file Set log filename + --log-append Append to log file --log-strip Strip control characters and escape sequences -m, --map Map characters -c, --color 0..255|bold|none|list Colorize tio text (default: bold) diff --git a/man/tio.1.in b/man/tio.1.in index ba2a9ad..a5f209e 100644 --- a/man/tio.1.in +++ b/man/tio.1.in @@ -390,6 +390,8 @@ Disable automatic connect Enable log to file .IP "\fBlog-file" Set log filename +.IP "\fBlog-append" +Append to log file .IP "\fBlog-strip" Enable strip of control and escape sequences from log .IP "\fBlocal-echo" diff --git a/man/tio.1.txt b/man/tio.1.txt index 252ca60..47318ac 100644 --- a/man/tio.1.txt +++ b/man/tio.1.txt @@ -305,6 +305,8 @@ CONFIGURATION FILE log-file Set log filename + log-append Append to log file + log-strip Enable strip of control and escape sequences from log local-echo Enable local echo diff --git a/src/bash-completion/tio.in b/src/bash-completion/tio.in index 9602c4f..abad324 100644 --- a/src/bash-completion/tio.in +++ b/src/bash-completion/tio.in @@ -22,6 +22,7 @@ _tio() -e --local-echo \ -l --log \ --log-file \ + --log-append \ --log-strip \ -m --map \ -t --timestamp \ @@ -90,6 +91,10 @@ _tio() COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; + --log-append) + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + ;; --log-strip) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 From df5379bac5f8af8ce9d64f262565a21ee46ee53c Mon Sep 17 00:00:00 2001 From: Wes Koerber Date: Thu, 13 Jul 2023 20:58:20 -0400 Subject: [PATCH 3/3] chore: reorder log-strip and log-append reorder to maintain consistency with documentation --- src/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options.c b/src/options.c index 9c0908c..e34c8d1 100644 --- a/src/options.c +++ b/src/options.c @@ -254,8 +254,8 @@ void options_parse(int argc, char *argv[]) {"list-devices", no_argument, 0, 'L' }, {"log", no_argument, 0, 'l' }, {"log-file", required_argument, 0, OPT_LOG_FILE }, - {"log-strip", no_argument, 0, OPT_LOG_STRIP }, {"log-append", no_argument, 0, OPT_LOG_APPEND }, + {"log-strip", no_argument, 0, OPT_LOG_STRIP }, {"socket", required_argument, 0, 'S' }, {"map", required_argument, 0, 'm' }, {"color", required_argument, 0, 'c' },