nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-14 01:27:35 -05:00
Code Issues Projects Releases Wiki Activity

Turn 'Filename' into a dynamically allocated type with no arbitrary

Browse Source 
length limit, just as I did to FontSpec yesterday.

[originally from svn r9316]
This commit is contained in:
Simon Tatham
2011-10-02 11:01:57 +00:00
parent 342690f7cb
commit 62cbc7dc0b
29 changed files with 289 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
logging.c
View File

@ -16,13 +16,13 @@ struct LogContext {
FILE *lgfp;
enum { L_CLOSED, L_OPENING, L_OPEN, L_ERROR } state;
bufchain queue;
Filename currlogfilename;
Filename *currlogfilename;
void *frontend;
Conf *conf;
int logtype; /* cached out of conf */
};
static void xlatlognam(Filename *d, Filename s, char *hostname, struct tm *tm);
static Filename *xlatlognam(Filename *s, char *hostname, struct tm *tm);
/*
* Internal wrapper function which must be called for _all_ output
@ -116,7 +116,7 @@ static void logfopen_callback(void *handle, int mode)
ctx->logtype == LGTYP_PACKETS ? "SSH packets" :
ctx->logtype == LGTYP_SSHRAW ? "SSH raw data" :
"unknown"),
filename_to_str(&ctx->currlogfilename));
filename_to_str(ctx->currlogfilename));
logevent(ctx->frontend, event);
sfree(event);
@ -155,9 +155,11 @@ void logfopen(void *handle)
tm = ltime();
/* substitute special codes in file name */
xlatlognam(&ctx->currlogfilename,
*conf_get_filename(ctx->conf, CONF_logfilename),
conf_get_str(ctx->conf, CONF_host), &tm);
if (ctx->currlogfilename)
filename_free(ctx->currlogfilename);
ctx->currlogfilename =
xlatlognam(conf_get_filename(ctx->conf, CONF_logfilename),
conf_get_str(ctx->conf, CONF_host), &tm);
ctx->lgfp = f_open(ctx->currlogfilename, "r", FALSE); /* file already present? */
if (ctx->lgfp) {
@ -338,6 +340,7 @@ void *log_init(void *frontend, Conf *conf)
ctx->frontend = frontend;
ctx->conf = conf_copy(conf);
ctx->logtype = conf_get_int(ctx->conf, CONF_logtype);
ctx->currlogfilename = NULL;
bufchain_init(&ctx->queue);
return ctx;
}
@ -348,6 +351,8 @@ void log_free(void *handle)
logfclose(ctx);
bufchain_clear(&ctx->queue);
if (ctx->currlogfilename)
filename_free(ctx->currlogfilename);
sfree(ctx);
}
@ -356,8 +361,8 @@ void log_reconfig(void *handle, Conf *conf)
struct LogContext *ctx = (struct LogContext *)handle;
int reset_logging;
if (!filename_equal(*conf_get_filename(ctx->conf, CONF_logfilename),
*conf_get_filename(conf, CONF_logfilename)) ||
if (!filename_equal(conf_get_filename(ctx->conf, CONF_logfilename),
conf_get_filename(conf, CONF_logfilename)) ||
conf_get_int(ctx->conf, CONF_logtype) !=
conf_get_int(conf, CONF_logtype))
reset_logging = TRUE;
@ -382,17 +387,19 @@ void log_reconfig(void *handle, Conf *conf)
*
* "&Y":YYYY "&m":MM "&d":DD "&T":hhmmss "&h":<hostname> "&&":&
*/
static void xlatlognam(Filename *dest, Filename src,
char *hostname, struct tm *tm) {
static Filename *xlatlognam(Filename *src, char *hostname, struct tm *tm)
{
char buf[10], *bufp;
int size;
char buffer[FILENAME_MAX];
int len = sizeof(buffer)-1;
char *d;
char *buffer;
int buflen, bufsize;
const char *s;
Filename *ret;
d = buffer;
s = filename_to_str(&src);
bufsize = FILENAME_MAX;
buffer = snewn(bufsize, char);
buflen = 0;
s = filename_to_str(src);
while (*s) {
/* Let (bufp, len) be the string to append. */
@ -428,13 +435,16 @@ static void xlatlognam(Filename *dest, Filename src,
buf[0] = *s++;
size = 1;
}
if (size > len)
size = len;
memcpy(d, bufp, size);
d += size;
len -= size;
if (bufsize <= buflen + size) {
bufsize = (buflen + size) * 5 / 4 + 512;
buffer = sresize(buffer, bufsize, char);
}
memcpy(buffer + buflen, bufp, size);
buflen += size;
}
*d = '\0';
buffer[buflen] = '\0';
*dest = filename_from_str(buffer);
ret = filename_from_str(buffer);
sfree(buffer);
return ret;
}