nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-18 19:41:01 -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
parent fecb51b03b c406d8efe5
commit ab8ae9a385
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
logging.c
View File

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