From c406d8efe539b165cd3386a6bf1ae3e5ee6ebc83 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Sun, 16 Jul 2023 16:03:24 +0100 Subject: [PATCH] logging: allow &H to expand to serial line. For serial connections, &H generally expanded to the empty string. This seems more useful. (It so happens that &H _could_ expand to the serial line if it came from the command-line, but that's accidental.) --- doc/config.but | 3 ++- logging.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/config.but b/doc/config.but index 96f73396..1990a92a 100644 --- a/doc/config.but +++ b/doc/config.but @@ -214,7 +214,8 @@ digits. \b \c{&T} will be replaced by the current time, as six digits (HHMMSS) with no punctuation. -\b \c{&H} will be replaced by the host name you are connecting to. +\b \c{&H} will be replaced by the host name you are connecting to +(or the serial line, for a serial connection). \b \c{&P} will be replaced by the port number you are connecting to on the target host. diff --git a/logging.c b/logging.c index ff687cb7..031aae4a 100644 --- a/logging.c +++ b/logging.c @@ -174,7 +174,7 @@ void logfopen(LogContext *ctx) filename_free(ctx->currlogfilename); ctx->currlogfilename = xlatlognam(conf_get_filename(ctx->conf, CONF_logfilename), - conf_get_str(ctx->conf, CONF_host), + conf_dest(ctx->conf), /* hostname or serial line */ conf_get_int(ctx->conf, CONF_port), &tm); if (open_for_write_would_lose_data(ctx->currlogfilename)) {