~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add proper error reports in write_random_seed, via the new 'nonfatal'
[sgt/putty]
/
unix
/
uxstore.c
diff --git
a/unix/uxstore.c
b/unix/uxstore.c
index
c5e40d4
..
785e1e3
100644
(file)
--- a/
unix/uxstore.c
+++ b/
unix/uxstore.c
@@
-672,18
+672,45
@@
void write_random_seed(void *data, int len)
*/
fd = open(fname, O_CREAT | O_WRONLY, 0600);
if (fd < 0) {
*/
fd = open(fname, O_CREAT | O_WRONLY, 0600);
if (fd < 0) {
+ if (errno != ENOENT) {
+ char *msg = dupprintf("Unable to write random seed: open(\"%s\") "
+ "returned '%s'", fname, strerror(errno));
+ nonfatal(msg);
+ sfree(msg);
+ return;
+ }
char *dir;
dir = make_filename(INDEX_DIR, NULL);
char *dir;
dir = make_filename(INDEX_DIR, NULL);
- mkdir(dir, 0700);
+ if (mkdir(dir, 0700) < 0) {
+ char *msg = dupprintf("Unable to write random seed: mkdir(\"%s\") "
+ "returned '%s'", dir, strerror(errno));
+ nonfatal(msg);
+ sfree(msg);
+ sfree(dir);
+ return;
+ }
sfree(dir);
fd = open(fname, O_CREAT | O_WRONLY, 0600);
sfree(dir);
fd = open(fname, O_CREAT | O_WRONLY, 0600);
+ if (errno != ENOENT) {
+ char *msg = dupprintf("Unable to write random seed: open(\"%s\") "
+ "returned '%s'", fname, strerror(errno));
+ nonfatal(msg);
+ sfree(msg);
+ return;
+ }
}
while (len > 0) {
int ret = write(fd, data, len);
}
while (len > 0) {
int ret = write(fd, data, len);
- if (ret <= 0) break;
+ if (ret < 0) {
+ char *msg = dupprintf("Unable to write random seed: write "
+ "returned '%s'", strerror(errno));
+ nonfatal(msg);
+ sfree(msg);
+ break;
+ }
len -= ret;
data = (char *)data + len;
}
len -= ret;
data = (char *)data + len;
}