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

Rewrite conf deserialisation using BinarySource.

Browse Source 
Like the corresponding rewrite of conf serialisation, this affects not
just conf_deserialise itself but also the per-platform filename and
fontspec deserialisers.
This commit is contained in:
Simon Tatham
2018-05-28 15:36:15 +01:00
parent e2431c3ef8
commit 876e1589f8
6 changed files with 68 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
unix/gtkmain.c
View File

@ -201,8 +201,9 @@ void launch_saved_session(const char *str)
int read_dupsession_data(Conf *conf, char *arg)
{
int fd, i, ret, size, size_used;
int fd, i, ret, size;
char *data;
BinarySource src[1];
if (sscanf(arg, "---[%d,%d]", &fd, &size) != 2) {
fprintf(stderr, "%s: malformed magic argument `%s'\n", appname, arg);
@ -222,35 +223,36 @@ int read_dupsession_data(Conf *conf, char *arg)
exit(1);
}
size_used = conf_deserialise(conf, data, size);
if (use_pty_argv && size > size_used) {
int n = 0;
i = size_used;
while (i < size) {
while (i < size && data[i]) i++;
if (i >= size) {
fprintf(stderr, "%s: malformed Duplicate Session data\n",
appname);
exit(1);
}
i++;
n++;
}
pty_argv = snewn(n+1, char *);
pty_argv[n] = NULL;
n = 0;
i = size_used;
while (i < size) {
char *p = data + i;
while (i < size && data[i]) i++;
assert(i < size);
i++;
pty_argv[n++] = dupstr(p);
}
BinarySource_BARE_INIT(src, data, size);
if (!conf_deserialise(conf, src)) {
fprintf(stderr, "%s: malformed Duplicate Session data\n", appname);
exit(1);
}
if (use_pty_argv) {
int pty_argc = 0;
size_t argv_startpos = src->pos;
while (get_asciz(src), !get_err(src))
pty_argc++;
src->err = BSE_NO_ERROR;
if (pty_argc > 0) {
src->pos = argv_startpos;
pty_argv = snewn(pty_argc + 1, char *);
pty_argv[pty_argc] = NULL;
for (i = 0; i < pty_argc; i++)
pty_argv[i] = dupstr(get_asciz(src));
}
}
if (get_err(src) || get_avail(src) > 0) {
fprintf(stderr, "%s: malformed Duplicate Session data\n", appname);
exit(1);
}
sfree(data);
return 0;
}

20
unix/uxmisc.c
View File

@ -78,16 +78,9 @@ void filename_serialise(BinarySink *bs, const Filename *f)
{
put_asciz(bs, f->path);
}
Filename *filename_deserialise(void *vdata, int maxsize, int *used)
Filename *filename_deserialise(BinarySource *src)
{
char *data = (char *)vdata;
char *end;
end = memchr(data, '\0', maxsize);
if (!end)
return NULL;
end++;
*used = end - data;
return filename_from_str(data);
return filename_from_str(get_asciz(src));
}
char filename_char_sanitise(char c)
@ -274,14 +267,9 @@ void fontspec_serialise(BinarySink *bs, FontSpec *f)
{
put_asciz(bs, f->name);
}
FontSpec *fontspec_deserialise(void *vdata, int maxsize, int *used)
FontSpec *fontspec_deserialise(BinarySource *src)
{
char *data = (char *)vdata;
char *end = memchr(data, '\0', maxsize);
if (!end)
return NULL;
*used = end - data + 1;
return fontspec_new(data);
return fontspec_new(get_asciz(src));
}
char *make_dir_and_check_ours(const char *dirname)