mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-25 01:02:24 +00:00
Can now save and load settings under Unix.
[originally from svn r3031]
This commit is contained in:
Simon Tatham
parent
b044c350f4
commit
0ec4f0620d
@ -993,6 +993,7 @@ static void list_selchange(GtkList *list, gpointer data)
|
||||
{
|
||||
struct dlgparam *dp = (struct dlgparam *)data;
|
||||
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(list));
|
||||
if (!uc) return;
|
||||
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_SELCHANGE);
|
||||
}
|
||||
|
||||
@ -1922,7 +1923,7 @@ int do_config_box(const char *title, Config *cfg)
|
||||
gtk_widget_unref(listitem);
|
||||
}
|
||||
|
||||
sl.nsessions = 0;
|
||||
get_sesslist(&sl, TRUE);
|
||||
|
||||
for (index = 0; index < lenof(scs.sc); index++) {
|
||||
scs.sc[index].action = SHORTCUT_EMPTY;
|
||||
@ -2115,6 +2116,7 @@ int do_config_box(const char *title, Config *cfg)
|
||||
|
||||
gtk_main();
|
||||
|
||||
get_sesslist(&sl, FALSE);
|
||||
dlg_cleanup(&dp);
|
||||
sfree(selparams);
|
||||
|
||||
|
||||
541
unix/uxstore.c
541
unix/uxstore.c
@ -5,191 +5,100 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <dirent.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include "putty.h"
|
||||
#include "storage.h"
|
||||
#include "tree234.h"
|
||||
|
||||
/*
|
||||
* For the moment, the only existing Unix utility is pterm and that
|
||||
* has no GUI configuration at all, so our write routines need do
|
||||
* nothing. Eventually I suppose these will read and write an rc
|
||||
* file somewhere or other.
|
||||
*/
|
||||
|
||||
void *open_settings_w(const char *sessionname)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void write_setting_s(void *handle, const char *key, const char *value)
|
||||
{
|
||||
}
|
||||
|
||||
void write_setting_i(void *handle, const char *key, int value)
|
||||
{
|
||||
}
|
||||
|
||||
void close_settings_w(void *handle)
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
* Reading settings, for the moment, is done by retrieving X
|
||||
* resources from the X display. When we introduce disk files, I
|
||||
* think what will happen is that the X resources will override
|
||||
* PuTTY's inbuilt defaults, but that the disk files will then
|
||||
* override those. This isn't optimal, but it's the best I can
|
||||
* immediately work out.
|
||||
*/
|
||||
|
||||
struct xrm_string {
|
||||
const char *key;
|
||||
const char *value;
|
||||
};
|
||||
|
||||
static tree234 *xrmtree = NULL;
|
||||
|
||||
int xrmcmp(void *av, void *bv)
|
||||
{
|
||||
struct xrm_string *a = (struct xrm_string *)av;
|
||||
struct xrm_string *b = (struct xrm_string *)bv;
|
||||
return strcmp(a->key, b->key);
|
||||
}
|
||||
|
||||
void provide_xrm_string(char *string)
|
||||
{
|
||||
char *p, *q, *key;
|
||||
struct xrm_string *xrms, *ret;
|
||||
|
||||
p = q = strchr(string, ':');
|
||||
if (!q) {
|
||||
fprintf(stderr, "pterm: expected a colon in resource string"
|
||||
" \"%s\"\n", string);
|
||||
return;
|
||||
}
|
||||
q++;
|
||||
while (p > string && p[-1] != '.' && p[-1] != '*')
|
||||
p--;
|
||||
xrms = snew(struct xrm_string);
|
||||
key = snewn(q-p, char);
|
||||
memcpy(key, p, q-p);
|
||||
key[q-p-1] = '\0';
|
||||
xrms->key = key;
|
||||
while (*q && isspace((unsigned char)*q))
|
||||
q++;
|
||||
xrms->value = dupstr(q);
|
||||
|
||||
if (!xrmtree)
|
||||
xrmtree = newtree234(xrmcmp);
|
||||
|
||||
ret = add234(xrmtree, xrms);
|
||||
if (ret) {
|
||||
/* Override an existing string. */
|
||||
del234(xrmtree, ret);
|
||||
add234(xrmtree, xrms);
|
||||
}
|
||||
}
|
||||
|
||||
const char *get_setting(const char *key)
|
||||
{
|
||||
struct xrm_string tmp, *ret;
|
||||
tmp.key = key;
|
||||
if (xrmtree) {
|
||||
ret = find234(xrmtree, &tmp, NULL);
|
||||
if (ret)
|
||||
return ret->value;
|
||||
}
|
||||
return x_get_default(key);
|
||||
}
|
||||
|
||||
void *open_settings_r(const char *sessionname)
|
||||
{
|
||||
static int thing_to_return_an_arbitrary_non_null_pointer_to;
|
||||
return &thing_to_return_an_arbitrary_non_null_pointer_to;
|
||||
}
|
||||
|
||||
char *read_setting_s(void *handle, const char *key, char *buffer, int buflen)
|
||||
{
|
||||
const char *val = get_setting(key);
|
||||
if (!val)
|
||||
return NULL;
|
||||
else {
|
||||
strncpy(buffer, val, buflen);
|
||||
buffer[buflen-1] = '\0';
|
||||
return buffer;
|
||||
}
|
||||
}
|
||||
|
||||
int read_setting_i(void *handle, const char *key, int defvalue)
|
||||
{
|
||||
const char *val = get_setting(key);
|
||||
if (!val)
|
||||
return defvalue;
|
||||
else
|
||||
return atoi(val);
|
||||
}
|
||||
|
||||
int read_setting_fontspec(void *handle, const char *name, FontSpec *result)
|
||||
{
|
||||
return !!read_setting_s(handle, name, result->name, sizeof(result->name));
|
||||
}
|
||||
int read_setting_filename(void *handle, const char *name, Filename *result)
|
||||
{
|
||||
return !!read_setting_s(handle, name, result->path, sizeof(result->path));
|
||||
}
|
||||
|
||||
void write_setting_fontspec(void *handle, const char *name, FontSpec result)
|
||||
{
|
||||
write_setting_s(handle, name, result.name);
|
||||
}
|
||||
void write_setting_filename(void *handle, const char *name, Filename result)
|
||||
{
|
||||
write_setting_s(handle, name, result.path);
|
||||
}
|
||||
|
||||
void close_settings_r(void *handle)
|
||||
{
|
||||
}
|
||||
|
||||
void del_settings(const char *sessionname)
|
||||
{
|
||||
}
|
||||
|
||||
void *enum_settings_start(void)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *enum_settings_next(void *handle, char *buffer, int buflen)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void enum_settings_finish(void *handle)
|
||||
{
|
||||
}
|
||||
|
||||
enum {
|
||||
INDEX_DIR, INDEX_HOSTKEYS, INDEX_RANDSEED
|
||||
INDEX_DIR, INDEX_HOSTKEYS, INDEX_RANDSEED,
|
||||
INDEX_SESSIONDIR, INDEX_SESSION,
|
||||
};
|
||||
|
||||
static void make_filename(char *filename, int index)
|
||||
static const char hex[16] = "0123456789ABCDEF";
|
||||
|
||||
static char *mungestr(const char *in)
|
||||
{
|
||||
char *out, *ret;
|
||||
|
||||
if (!in)
|
||||
in = "Default Settings";
|
||||
|
||||
ret = out = snewn(3*strlen(in)+1, char);
|
||||
|
||||
while (*in) {
|
||||
/*
|
||||
* There are remarkably few punctuation characters that
|
||||
* aren't shell-special in some way or likely to be used as
|
||||
* separators in some file format or another! Hence we use
|
||||
* opt-in for safe characters rather than opt-out for
|
||||
* specific unsafe ones...
|
||||
*/
|
||||
if (*in!='+' && *in!='-' && *in!='.' && *in!='@' && *in!='_' &&
|
||||
!(*in >= '0' && *in <= '9') &&
|
||||
!(*in >= 'A' && *in <= 'Z') &&
|
||||
!(*in >= 'a' && *in <= 'z')) {
|
||||
*out++ = '%';
|
||||
*out++ = hex[((unsigned char) *in) >> 4];
|
||||
*out++ = hex[((unsigned char) *in) & 15];
|
||||
} else
|
||||
*out++ = *in;
|
||||
in++;
|
||||
}
|
||||
*out = '\0';
|
||||
return ret;
|
||||
}
|
||||
|
||||
static char *unmungestr(const char *in)
|
||||
{
|
||||
char *out, *ret;
|
||||
out = ret = snewn(strlen(in)+1, char);
|
||||
while (*in) {
|
||||
if (*in == '%' && in[1] && in[2]) {
|
||||
int i, j;
|
||||
|
||||
i = in[1] - '0';
|
||||
i -= (i > 9 ? 7 : 0);
|
||||
j = in[2] - '0';
|
||||
j -= (j > 9 ? 7 : 0);
|
||||
|
||||
*out++ = (i << 4) + j;
|
||||
in += 3;
|
||||
} else {
|
||||
*out++ = *in++;
|
||||
}
|
||||
}
|
||||
*out = '\0';
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void make_filename(char *filename, int index, const char *subname)
|
||||
{
|
||||
char *home;
|
||||
int len;
|
||||
home = getenv("HOME");
|
||||
strncpy(filename, home, FILENAME_MAX);
|
||||
len = strlen(filename);
|
||||
strncpy(filename + len,
|
||||
index == INDEX_DIR ? "/.putty" :
|
||||
index == INDEX_HOSTKEYS ? "/.putty/sshhostkeys" :
|
||||
index == INDEX_RANDSEED ? "/.putty/randomseed" :
|
||||
"/.putty/ERROR", FILENAME_MAX - len);
|
||||
if (index == INDEX_SESSION) {
|
||||
char *munged = mungestr(subname);
|
||||
char *fn = dupprintf("/.putty/sessions/%s", munged);
|
||||
strncpy(filename + len, fn, FILENAME_MAX - len);
|
||||
sfree(fn);
|
||||
sfree(munged);
|
||||
} else {
|
||||
strncpy(filename + len,
|
||||
index == INDEX_DIR ? "/.putty" :
|
||||
index == INDEX_SESSIONDIR ? "/.putty/sessions" :
|
||||
index == INDEX_HOSTKEYS ? "/.putty/sshhostkeys" :
|
||||
index == INDEX_RANDSEED ? "/.putty/randomseed" :
|
||||
"/.putty/ERROR", FILENAME_MAX - len);
|
||||
}
|
||||
filename[FILENAME_MAX-1] = '\0';
|
||||
}
|
||||
|
||||
@ -216,6 +125,292 @@ static char *fgetline(FILE *fp)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* For the moment, the only existing Unix utility is pterm and that
|
||||
* has no GUI configuration at all, so our write routines need do
|
||||
* nothing. Eventually I suppose these will read and write an rc
|
||||
* file somewhere or other.
|
||||
*/
|
||||
|
||||
void *open_settings_w(const char *sessionname)
|
||||
{
|
||||
char filename[FILENAME_MAX];
|
||||
FILE *fp;
|
||||
|
||||
/*
|
||||
* Start by making sure the sessions subdir exists. Ignore the
|
||||
* error return from mkdir since it's perfectly likely to be
|
||||
* `already exists', and any other error will trip us up later
|
||||
* on so there's no real need to catch it now.
|
||||
*/
|
||||
make_filename(filename, INDEX_SESSIONDIR, sessionname);
|
||||
mkdir(filename, 0700);
|
||||
|
||||
make_filename(filename, INDEX_SESSION, sessionname);
|
||||
fp = fopen(filename, "w");
|
||||
if (!fp)
|
||||
return NULL; /* can't open */
|
||||
return fp;
|
||||
}
|
||||
|
||||
void write_setting_s(void *handle, const char *key, const char *value)
|
||||
{
|
||||
FILE *fp = (FILE *)handle;
|
||||
fprintf(fp, "%s=%s\n", key, value);
|
||||
}
|
||||
|
||||
void write_setting_i(void *handle, const char *key, int value)
|
||||
{
|
||||
FILE *fp = (FILE *)handle;
|
||||
fprintf(fp, "%s=%d\n", key, value);
|
||||
}
|
||||
|
||||
void close_settings_w(void *handle)
|
||||
{
|
||||
FILE *fp = (FILE *)handle;
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
/*
|
||||
* Reading settings, for the moment, is done by retrieving X
|
||||
* resources from the X display. When we introduce disk files, I
|
||||
* think what will happen is that the X resources will override
|
||||
* PuTTY's inbuilt defaults, but that the disk files will then
|
||||
* override those. This isn't optimal, but it's the best I can
|
||||
* immediately work out.
|
||||
*/
|
||||
|
||||
struct keyval {
|
||||
const char *key;
|
||||
const char *value;
|
||||
};
|
||||
|
||||
static tree234 *xrmtree = NULL;
|
||||
|
||||
int keycmp(void *av, void *bv)
|
||||
{
|
||||
struct keyval *a = (struct keyval *)av;
|
||||
struct keyval *b = (struct keyval *)bv;
|
||||
return strcmp(a->key, b->key);
|
||||
}
|
||||
|
||||
void provide_xrm_string(char *string)
|
||||
{
|
||||
char *p, *q, *key;
|
||||
struct keyval *xrms, *ret;
|
||||
|
||||
p = q = strchr(string, ':');
|
||||
if (!q) {
|
||||
fprintf(stderr, "pterm: expected a colon in resource string"
|
||||
" \"%s\"\n", string);
|
||||
return;
|
||||
}
|
||||
q++;
|
||||
while (p > string && p[-1] != '.' && p[-1] != '*')
|
||||
p--;
|
||||
xrms = snew(struct keyval);
|
||||
key = snewn(q-p, char);
|
||||
memcpy(key, p, q-p);
|
||||
key[q-p-1] = '\0';
|
||||
xrms->key = key;
|
||||
while (*q && isspace((unsigned char)*q))
|
||||
q++;
|
||||
xrms->value = dupstr(q);
|
||||
|
||||
if (!xrmtree)
|
||||
xrmtree = newtree234(keycmp);
|
||||
|
||||
ret = add234(xrmtree, xrms);
|
||||
if (ret) {
|
||||
/* Override an existing string. */
|
||||
del234(xrmtree, ret);
|
||||
add234(xrmtree, xrms);
|
||||
}
|
||||
}
|
||||
|
||||
const char *get_setting(const char *key)
|
||||
{
|
||||
struct keyval tmp, *ret;
|
||||
tmp.key = key;
|
||||
if (xrmtree) {
|
||||
ret = find234(xrmtree, &tmp, NULL);
|
||||
if (ret)
|
||||
return ret->value;
|
||||
}
|
||||
return x_get_default(key);
|
||||
}
|
||||
|
||||
void *open_settings_r(const char *sessionname)
|
||||
{
|
||||
char filename[FILENAME_MAX];
|
||||
FILE *fp;
|
||||
char *line;
|
||||
tree234 *ret;
|
||||
|
||||
make_filename(filename, INDEX_SESSION, sessionname);
|
||||
fp = fopen(filename, "r");
|
||||
if (!fp)
|
||||
return NULL; /* can't open */
|
||||
|
||||
ret = newtree234(keycmp);
|
||||
|
||||
while ( (line = fgetline(fp)) ) {
|
||||
char *value = strchr(line, '=');
|
||||
struct keyval *kv;
|
||||
|
||||
if (!value)
|
||||
continue;
|
||||
*value++ = '\0';
|
||||
value[strcspn(value, "\r\n")] = '\0'; /* trim trailing NL */
|
||||
|
||||
kv = snew(struct keyval);
|
||||
kv->key = dupstr(line);
|
||||
kv->value = dupstr(value);
|
||||
add234(ret, kv);
|
||||
|
||||
sfree(line);
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
char *read_setting_s(void *handle, const char *key, char *buffer, int buflen)
|
||||
{
|
||||
tree234 *tree = (tree234 *)handle;
|
||||
const char *val;
|
||||
struct keyval tmp, *kv;
|
||||
|
||||
tmp.key = key;
|
||||
if (tree != NULL &&
|
||||
(kv = find234(tree, &tmp, NULL)) != NULL) {
|
||||
val = kv->value;
|
||||
assert(val != NULL);
|
||||
} else
|
||||
val = get_setting(key);
|
||||
|
||||
if (!val)
|
||||
return NULL;
|
||||
else {
|
||||
strncpy(buffer, val, buflen);
|
||||
buffer[buflen-1] = '\0';
|
||||
return buffer;
|
||||
}
|
||||
}
|
||||
|
||||
int read_setting_i(void *handle, const char *key, int defvalue)
|
||||
{
|
||||
tree234 *tree = (tree234 *)handle;
|
||||
const char *val;
|
||||
struct keyval tmp, *kv;
|
||||
|
||||
tmp.key = key;
|
||||
if (tree != NULL &&
|
||||
(kv = find234(tree, &tmp, NULL)) != NULL) {
|
||||
val = kv->value;
|
||||
assert(val != NULL);
|
||||
} else
|
||||
val = get_setting(key);
|
||||
|
||||
if (!val)
|
||||
return defvalue;
|
||||
else
|
||||
return atoi(val);
|
||||
}
|
||||
|
||||
int read_setting_fontspec(void *handle, const char *name, FontSpec *result)
|
||||
{
|
||||
return !!read_setting_s(handle, name, result->name, sizeof(result->name));
|
||||
}
|
||||
int read_setting_filename(void *handle, const char *name, Filename *result)
|
||||
{
|
||||
return !!read_setting_s(handle, name, result->path, sizeof(result->path));
|
||||
}
|
||||
|
||||
void write_setting_fontspec(void *handle, const char *name, FontSpec result)
|
||||
{
|
||||
write_setting_s(handle, name, result.name);
|
||||
}
|
||||
void write_setting_filename(void *handle, const char *name, Filename result)
|
||||
{
|
||||
write_setting_s(handle, name, result.path);
|
||||
}
|
||||
|
||||
void close_settings_r(void *handle)
|
||||
{
|
||||
tree234 *tree = (tree234 *)handle;
|
||||
struct keyval *kv;
|
||||
|
||||
if (!tree)
|
||||
return;
|
||||
|
||||
while ( (kv = index234(tree, 0)) != NULL) {
|
||||
del234(tree, kv);
|
||||
sfree((char *)kv->key);
|
||||
sfree((char *)kv->value);
|
||||
sfree(kv);
|
||||
}
|
||||
|
||||
freetree234(tree);
|
||||
}
|
||||
|
||||
void del_settings(const char *sessionname)
|
||||
{
|
||||
char filename[FILENAME_MAX];
|
||||
make_filename(filename, INDEX_SESSION, sessionname);
|
||||
unlink(filename);
|
||||
}
|
||||
|
||||
void *enum_settings_start(void)
|
||||
{
|
||||
DIR *dp;
|
||||
char filename[FILENAME_MAX];
|
||||
|
||||
make_filename(filename, INDEX_SESSIONDIR, NULL);
|
||||
dp = opendir(filename);
|
||||
|
||||
return dp;
|
||||
}
|
||||
|
||||
char *enum_settings_next(void *handle, char *buffer, int buflen)
|
||||
{
|
||||
DIR *dp = (DIR *)handle;
|
||||
struct dirent *de;
|
||||
struct stat st;
|
||||
char fullpath[FILENAME_MAX];
|
||||
int len;
|
||||
char *unmunged;
|
||||
|
||||
make_filename(fullpath, INDEX_SESSIONDIR, NULL);
|
||||
len = strlen(fullpath);
|
||||
|
||||
while ( (de = readdir(dp)) != NULL ) {
|
||||
if (len < FILENAME_MAX) {
|
||||
fullpath[len] = '/';
|
||||
strncpy(fullpath+len+1, de->d_name, FILENAME_MAX-(len+1));
|
||||
fullpath[FILENAME_MAX-1] = '\0';
|
||||
}
|
||||
|
||||
if (stat(fullpath, &st) < 0 || !S_ISREG(st.st_mode))
|
||||
continue; /* try another one */
|
||||
|
||||
unmunged = unmungestr(de->d_name);
|
||||
strncpy(buffer, unmunged, buflen);
|
||||
buffer[buflen-1] = '\0';
|
||||
sfree(unmunged);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void enum_settings_finish(void *handle)
|
||||
{
|
||||
DIR *dp = (DIR *)handle;
|
||||
closedir(dp);
|
||||
}
|
||||
|
||||
/*
|
||||
* Lines in the host keys file are of the form
|
||||
*
|
||||
@ -233,7 +428,7 @@ int verify_host_key(const char *hostname, int port,
|
||||
char *line;
|
||||
int ret;
|
||||
|
||||
make_filename(filename, INDEX_HOSTKEYS);
|
||||
make_filename(filename, INDEX_HOSTKEYS, NULL);
|
||||
fp = fopen(filename, "r");
|
||||
if (!fp)
|
||||
return 1; /* key does not exist */
|
||||
@ -299,12 +494,12 @@ void store_host_key(const char *hostname, int port,
|
||||
int fd;
|
||||
char filename[FILENAME_MAX];
|
||||
|
||||
make_filename(filename, INDEX_HOSTKEYS);
|
||||
make_filename(filename, INDEX_HOSTKEYS, NULL);
|
||||
fd = open(filename, O_CREAT | O_APPEND | O_RDWR, 0600);
|
||||
if (fd < 0) {
|
||||
char dir[FILENAME_MAX];
|
||||
|
||||
make_filename(dir, INDEX_DIR);
|
||||
make_filename(dir, INDEX_DIR, NULL);
|
||||
mkdir(dir, 0700);
|
||||
fd = open(filename, O_CREAT | O_APPEND | O_RDWR, 0600);
|
||||
}
|
||||
@ -322,7 +517,7 @@ void read_random_seed(noise_consumer_t consumer)
|
||||
int fd;
|
||||
char fname[FILENAME_MAX];
|
||||
|
||||
make_filename(fname, INDEX_RANDSEED);
|
||||
make_filename(fname, INDEX_RANDSEED, NULL);
|
||||
fd = open(fname, O_RDONLY);
|
||||
if (fd) {
|
||||
char buf[512];
|
||||
@ -338,7 +533,7 @@ void write_random_seed(void *data, int len)
|
||||
int fd;
|
||||
char fname[FILENAME_MAX];
|
||||
|
||||
make_filename(fname, INDEX_RANDSEED);
|
||||
make_filename(fname, INDEX_RANDSEED, NULL);
|
||||
/*
|
||||
* Don't truncate the random seed file if it already exists; if
|
||||
* something goes wrong half way through writing it, it would
|
||||
@ -348,7 +543,7 @@ void write_random_seed(void *data, int len)
|
||||
if (fd < 0) {
|
||||
char dir[FILENAME_MAX];
|
||||
|
||||
make_filename(dir, INDEX_DIR);
|
||||
make_filename(dir, INDEX_DIR, NULL);
|
||||
mkdir(dir, 0700);
|
||||
fd = open(fname, O_CREAT | O_WRONLY, 0600);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user