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

Oops, Ben is quite right about the rather appalling design of

Browse Source 
filename_from_str. Here's a better fix, with some const
repercussions too.

[originally from svn r2768]
This commit is contained in:
Simon Tatham
2003-02-01 17:24:27 +00:00
parent 947b70006e
commit bd16b29a7a
12 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
logging.c
View File

@ -146,7 +146,7 @@ void logfopen(void *handle)
ctx->cfg.logtype == LGTYP_DEBUG ? "raw" :
ctx->cfg.logtype == LGTYP_PACKETS ? "SSH packets" : "<ukwn>"));
/* Make sure we do not exceed the output buffer size */
strncat(buf, filename_to_str(ctx->currlogfilename), 128);
strncat(buf, filename_to_str(&ctx->currlogfilename), 128);
buf[strlen(buf)] = '\0';
logevent(ctx->frontend, buf);
}
@ -210,10 +210,11 @@ static void xlatlognam(Filename *dest, Filename src,
int size;
char buffer[FILENAME_MAX];
int len = sizeof(buffer)-1;
char *d, *s;
char *d;
const char *s;
d = buffer;
s = filename_to_str(src);
s = filename_to_str(&src);
while (*s) {
/* Let (bufp, len) be the string to append. */
@ -257,5 +258,5 @@ static void xlatlognam(Filename *dest, Filename src,
}
*d = '\0';
*dest = filename_from_str(s);
*dest = filename_from_str(d);
}