nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-31 02:32:49 -05:00
Code Issues Projects Releases Wiki Activity

Merge log file name tweaks from 'pre-0.79'.

Browse Source
This commit is contained in:
Jacob Nevins 2023-07-16 16:38:56 +01:00
commit ab8ae9a385
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/config.but
View File

@ -214,12 +214,15 @@ digits.
\b \c{&T} will be replaced by the current time, as six digits \b \c{&T} will be replaced by the current time, as six digits
(HHMMSS) with no punctuation. (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 \b \c{&P} will be replaced by the port number you are connecting to on
the target host. the target host.
For example, if you enter the host name (These are all case-insensitive.)
For example, if you enter the file name
\c{c:\\puttylogs\\log-&h-&y&m&d-&t.dat}, you will end up with files looking \c{c:\\puttylogs\\log-&h-&y&m&d-&t.dat}, you will end up with files looking
like like

15
logging.c
View File

@ -22,8 +22,9 @@ struct LogContext {
int logtype; /* cached out of conf */ int logtype; /* cached out of conf */
}; };
static Filename *xlatlognam(Filename *s, char *hostname, int port, static Filename *xlatlognam(const Filename *s,
struct tm *tm); const char *hostname, int port,
const struct tm *tm);
/* /*
* Internal wrapper function which must be called for _all_ output * Internal wrapper function which must be called for _all_ output
@ -173,7 +174,7 @@ void logfopen(LogContext *ctx)
filename_free(ctx->currlogfilename); filename_free(ctx->currlogfilename);
ctx->currlogfilename = ctx->currlogfilename =
xlatlognam(conf_get_filename(ctx->conf, CONF_logfilename), 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); conf_get_int(ctx->conf, CONF_port), &tm);
if (open_for_write_would_lose_data(ctx->currlogfilename)) { if (open_for_write_would_lose_data(ctx->currlogfilename)) {
@ -431,10 +432,12 @@ void log_reconfig(LogContext *ctx, Conf *conf)
* *
* "&Y":YYYY "&m":MM "&d":DD "&T":hhmmss "&h":<hostname> "&&":& * "&Y":YYYY "&m":MM "&d":DD "&T":hhmmss "&h":<hostname> "&&":&
*/ */
static Filename *xlatlognam(Filename *src, char *hostname, int port, static Filename *xlatlognam(const Filename *src,
struct tm *tm) const char *hostname, int port,
const struct tm *tm)
{ {
char buf[32], *bufp; char buf[32];
const char *bufp;
int size; int size;
strbuf *buffer; strbuf *buffer;
const char *s; const char *s;