/*
* Start by making sure the .putty directory and its sessions
- * subdir actually exist. Ignore error returns from mkdir since
- * they're 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.
+ * subdir actually exist.
*/
+ filename = make_filename(INDEX_DIR, NULL);
+ if (mkdir(filename, 0700) < 0 && errno != EEXIST) {
+ *errmsg = dupprintf("Unable to save session: mkdir(\"%s\") "
+ "returned '%s'", filename, strerror(errno));
+ sfree(filename);
+ return NULL;
+ }
+ sfree(filename);
+
filename = make_filename(INDEX_SESSIONDIR, NULL);
- if (mkdir(filename, 0700) != 0) {
- char *filename2 = make_filename(INDEX_DIR, NULL);
- mkdir(filename2, 0700);
- sfree(filename2);
- mkdir(filename, 0700);
+ if (mkdir(filename, 0700) < 0 && errno != EEXIST) {
+ *errmsg = dupprintf("Unable to save session: mkdir(\"%s\") "
+ "returned '%s'", filename, strerror(errno));
+ sfree(filename);
+ return NULL;
}
sfree(filename);
filename = make_filename(INDEX_SESSION, sessionname);
fp = fopen(filename, "w");
if (!fp) {
- *errmsg = dupprintf("Unable to create %s: %s",
- filename, strerror(errno));
+ *errmsg = dupprintf("Unable to save session: open(\"%s\") "
+ "returned '%s'", filename, strerror(errno));
sfree(filename);
return NULL; /* can't open */
}
char *value = strchr(line, '=');
struct skeyval *kv;
- if (!value)
+ if (!value) {
+ sfree(line);
continue;
+ }
*value++ = '\0';
value[strcspn(value, "\r\n")] = '\0'; /* trim trailing NL */
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 *fs)
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)
return ret;
}
+int have_ssh_host_key(const char *hostname, int port,
+ const char *keytype)
+{
+ /*
+ * If we have a host key, verify_host_key will return 0 or 2.
+ * If we don't have one, it'll return 1.
+ */
+ return verify_host_key(hostname, port, keytype, "") != 1;
+}
+
void store_host_key(const char *hostname, int port,
const char *keytype, const char *key)
{
int headerlen;
char *filename, *tmpfilename;
- newtext = dupprintf("%s@%d:%s %s\n", keytype, port, hostname, key);
- headerlen = 1 + strcspn(newtext, " "); /* count the space too */
-
/*
* Open both the old file and a new file.
*/
tmpfilename = make_filename(INDEX_HOSTKEYS_TMP, NULL);
wfp = fopen(tmpfilename, "w");
- if (!wfp) {
+ if (!wfp && errno == ENOENT) {
char *dir;
dir = make_filename(INDEX_DIR, NULL);
- mkdir(dir, 0700);
+ if (mkdir(dir, 0700) < 0) {
+ nonfatal("Unable to store host key: mkdir(\"%s\") "
+ "returned '%s'", dir, strerror(errno));
+ sfree(dir);
+ sfree(tmpfilename);
+ return;
+ }
sfree(dir);
wfp = fopen(tmpfilename, "w");
}
if (!wfp) {
- sfree(tmpfilename);
- return;
+ nonfatal("Unable to store host key: open(\"%s\") "
+ "returned '%s'", tmpfilename, strerror(errno));
+ sfree(tmpfilename);
+ return;
}
filename = make_filename(INDEX_HOSTKEYS, NULL);
rfp = fopen(filename, "r");
+ newtext = dupprintf("%s@%d:%s %s\n", keytype, port, hostname, key);
+ headerlen = 1 + strcspn(newtext, " "); /* count the space too */
+
/*
* Copy all lines from the old file to the new one that _don't_
* involve the same host key identifier as the one we're adding.
while ( (line = fgetline(rfp)) ) {
if (strncmp(line, newtext, headerlen))
fputs(line, wfp);
+ sfree(line);
}
fclose(rfp);
}
fclose(wfp);
- rename(tmpfilename, filename);
+ if (rename(tmpfilename, filename) < 0) {
+ nonfatal("Unable to store host key: rename(\"%s\",\"%s\")"
+ " returned '%s'", tmpfilename, filename,
+ strerror(errno));
+ }
sfree(tmpfilename);
sfree(filename);
*/
fd = open(fname, O_CREAT | O_WRONLY, 0600);
if (fd < 0) {
+ if (errno != ENOENT) {
+ nonfatal("Unable to write random seed: open(\"%s\") "
+ "returned '%s'", fname, strerror(errno));
+ sfree(fname);
+ return;
+ }
char *dir;
dir = make_filename(INDEX_DIR, NULL);
- mkdir(dir, 0700);
+ if (mkdir(dir, 0700) < 0) {
+ nonfatal("Unable to write random seed: mkdir(\"%s\") "
+ "returned '%s'", dir, strerror(errno));
+ sfree(fname);
+ sfree(dir);
+ return;
+ }
sfree(dir);
fd = open(fname, O_CREAT | O_WRONLY, 0600);
+ if (fd < 0) {
+ nonfatal("Unable to write random seed: open(\"%s\") "
+ "returned '%s'", fname, strerror(errno));
+ sfree(fname);
+ return;
+ }
}
while (len > 0) {
int ret = write(fd, data, len);
- if (ret <= 0) break;
+ if (ret < 0) {
+ nonfatal("Unable to write random seed: write "
+ "returned '%s'", strerror(errno));
+ break;
+ }
len -= ret;
data = (char *)data + len;
}
projects / PuTTY.git / blobdiff