New upstream version 2.4

[tio] / src / options.c

diff --git a/src/options.c b/src/options.c
index 7b61fd810adabc8bf98ca0c6ac111421d38b4105..eb75144edf7ae99445fa1b67dd7697659b311edb 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -38,6 +38,7 @@
 #include "rs485.h"
 #include "timestamp.h"
 #include "alert.h"
+#include "log.h"
 
 enum opt_t
 {
@@ -51,6 +52,7 @@ enum opt_t
     OPT_RS485_CONFIG,
     OPT_ALERT,
     OPT_COMPLETE_SUB_CONFIGS,
+    OPT_MUTE,
 };
 
 /* Default options */
@@ -99,7 +101,7 @@ void print_help(char *argv[])
 
     printf("Usage: tio [<options>] <tty-device|sub-config>\n");
     printf("\n");
-    printf("Connect to tty device directly or via sub-configuration.\n");
+    printf("Connect to TTY device directly or via sub-configuration.\n");
     printf("\n");
     printf("Options:\n");
     printf("  -b, --baudrate <bps>                   Baud rate (default: 115200)\n");
@@ -127,6 +129,7 @@ void print_help(char *argv[])
     printf("      --rs-485                           Enable RS-485 mode\n");
     printf("      --rs-485-config <config>           Set RS-485 configuration\n");
     printf("      --alert bell|blink|none            Alert on connect/disconnect (default: none)\n");
+    printf("      --mute                             Mute tio\n");
     printf("  -v, --version                          Display version\n");
     printf("  -h, --help                             Display help\n");
     printf("\n");
@@ -193,7 +196,7 @@ void line_pulse_duration_option_parse(const char *arg)
 
 void options_print()
 {
-    tio_printf(" TTY device: %s", option.tty_device);
+    tio_printf(" Device: %s", option.tty_device);
     tio_printf(" Baudrate: %u", option.baudrate);
     tio_printf(" Databits: %d", option.databits);
     tio_printf(" Flow: %s", option.flow);
@@ -214,7 +217,7 @@ void options_print()
     if (option.map[0] != 0)
         tio_printf(" Map flags: %s", option.map);
     if (option.log)
-        tio_printf(" Log file: %s", option.log_filename);
+        tio_printf(" Log file: %s", log_get_filename());
     if (option.socket)
         tio_printf(" Socket: %s", option.socket);
 }
@@ -258,6 +261,7 @@ void options_parse(int argc, char *argv[])
             {"rs-485",               no_argument,       0, OPT_RS485               },
             {"rs-485-config",        required_argument, 0, OPT_RS485_CONFIG        },
             {"alert",                required_argument, 0, OPT_ALERT               },
+            {"mute",                 no_argument,       0, OPT_MUTE                },
             {"version",              no_argument,       0, 'v'                     },
             {"help",                 no_argument,       0, 'h'                     },
             {"complete-sub-configs", no_argument,       0, OPT_COMPLETE_SUB_CONFIGS},
@@ -413,6 +417,10 @@ void options_parse(int argc, char *argv[])
                 option.alert = alert_option_parse(optarg);
                 break;
 
+            case OPT_MUTE:
+                option.mute = true;
+                break;
+
             case 'v':
                 printf("tio v%s\n", VERSION);
                 exit(EXIT_SUCCESS);