return atoi(val);
}
-int read_setting_fontspec(void *handle, const char *name, FontSpec *result)
+FontSpec *read_setting_fontspec(void *handle, const char *name)
{
/*
* In GTK1-only PuTTY, we used to store font names simply as a
char *tmp;
if ((tmp = read_setting_s(handle, suffname)) != NULL) {
- strncpy(result->name, tmp, sizeof(result->name)-1);
- result->name[sizeof(result->name)-1] = '\0';
+ FontSpec *fs = fontspec_new(tmp);
sfree(suffname);
sfree(tmp);
- return TRUE; /* got new-style name */
+ return fs; /* got new-style name */
}
sfree(suffname);
/* Fall back to old-style name. */
tmp = read_setting_s(handle, name);
if (tmp && *tmp) {
- strcpy(result->name, "server:");
- strncpy(result->name + 7, tmp, sizeof(result->name) - 8);
- result->name[sizeof(result->name)-1] = '\0';
+ char *tmp2 = dupcat("server:", tmp, NULL);
+ FontSpec *fs = fontspec_new(tmp2);
+ sfree(tmp2);
sfree(tmp);
- return TRUE;
+ return fs;
} else {
sfree(tmp);
- return FALSE;
+ return NULL;
}
}
-int read_setting_filename(void *handle, const char *name, Filename *result)
+Filename *read_setting_filename(void *handle, const char *name)
{
char *tmp = read_setting_s(handle, name);
if (tmp) {
- strncpy(result->path, tmp, sizeof(result->path)-1);
- result->path[sizeof(result->path)-1] = '\0';
+ Filename *ret = filename_from_str(tmp);
sfree(tmp);
- return TRUE;
+ return ret;
} else
- return FALSE;
+ return NULL;
}
-void write_setting_fontspec(void *handle, const char *name, FontSpec result)
+void write_setting_fontspec(void *handle, const char *name, FontSpec *fs)
{
/*
* read_setting_fontspec had to handle two cases, but when
* new-style name.
*/
char *suffname = dupcat(name, "Name", NULL);
- write_setting_s(handle, suffname, result.name);
+ write_setting_s(handle, suffname, fs->name);
sfree(suffname);
}
-void write_setting_filename(void *handle, const char *name, Filename result)
+void write_setting_filename(void *handle, const char *name, Filename *result)
{
- write_setting_s(handle, name, result.path);
+ write_setting_s(handle, name, result->path);
}
void close_settings_r(void *handle)