X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d082ac49971a1c1a9e84c5b201c30aab675f154f..9546c9c6fd9b1c67c92f4ea2f0039039c63d2f8e:/mac/macstore.c

diff --git a/mac/macstore.c b/mac/macstore.c
index fa6493a0..af3503ce 100644
--- a/mac/macstore.c
+++ b/mac/macstore.c
@@ -1,4 +1,4 @@
-/* $Id: macstore.c,v 1.1 2002/11/19 02:13:46 ben Exp $ */
+/* $Id: macstore.c,v 1.7 2003/01/08 22:46:12 ben Exp $ */
 
 /*
  * macstore.c: Macintosh-specific impementation of the interface
@@ -15,12 +15,13 @@
 
 #include "putty.h"
 #include "storage.h"
+#include "mac.h"
 
 #define PUTTY_CREATOR	FOUR_CHAR_CODE('pTTY')
 #define SESS_TYPE	FOUR_CHAR_CODE('Sess')
+#define SEED_TYPE	FOUR_CHAR_CODE('Seed')
 
 
-OSErr get_session_dir(Boolean makeit, short *pVRefNum, long *pDirID);
 OSErr FSpGetDirID(FSSpec *f, long *idp, Boolean makeit);
 
 /*
@@ -28,11 +29,12 @@ OSErr FSpGetDirID(FSSpec *f, long *idp, Boolean makeit);
  * preferences folder.  Each (key,value) pair is stored as a resource.
  */
 
-OSErr get_session_dir(Boolean makeit, short *pVRefNum, long *pDirID) {
+OSErr get_putty_dir(Boolean makeit, short *pVRefNum, long *pDirID)
+{
     OSErr error = noErr;
     short prefVRefNum;
-    FSSpec puttydir, sessdir;
-    long prefDirID, puttyDirID, sessDirID;
+    FSSpec puttydir;
+    long prefDirID, puttyDirID;
 
     error = FindFolder(kOnSystemDisk, kPreferencesFolderType, makeit,
 		       &prefVRefNum, &prefDirID);
@@ -43,13 +45,28 @@ OSErr get_session_dir(Boolean makeit, short *pVRefNum, long *pDirID) {
     error = FSpGetDirID(&puttydir, &puttyDirID, makeit);
     if (error != noErr) goto out;
 
-    error = FSMakeFSSpec(prefVRefNum, puttyDirID, "\pSaved Sessions",
+    *pVRefNum = prefVRefNum;
+    *pDirID = puttyDirID;
+
+  out:
+    return error;
+}
+
+OSErr get_session_dir(Boolean makeit, short *pVRefNum, long *pDirID) {
+    OSErr error = noErr;
+    short puttyVRefNum;
+    FSSpec sessdir;
+    long puttyDirID, sessDirID;
+
+    error = get_putty_dir(makeit, &puttyVRefNum, &puttyDirID);
+    if (error != noErr) goto out;
+    error = FSMakeFSSpec(puttyVRefNum, puttyDirID, "\pSaved Sessions",
 			 &sessdir);
     if (error != noErr && error != fnfErr) goto out;
     error = FSpGetDirID(&sessdir, &sessDirID, makeit);
     if (error != noErr) goto out;
 
-    *pVRefNum = prefVRefNum;
+    *pVRefNum = puttyVRefNum;
     *pDirID = sessDirID;
 
   out:
@@ -87,7 +104,6 @@ struct write_settings {
 void *open_settings_w(char *sessionname) {
     short sessVRefNum, tmpVRefNum;
     long sessDirID, tmpDirID;
-    FSSpec sessfile;
     OSErr error;
     Str255 psessionname;
     struct write_settings *ws;
@@ -192,21 +208,32 @@ void close_settings_w(void *handle) {
     safefree(handle);
 }
 
-void *open_settings_r(char *sessionname) {
+void *open_settings_r(char *sessionname)
+{
     short sessVRefNum;
     long sessDirID;
     FSSpec sessfile;
     OSErr error;
     Str255 psessionname;
-    int fd;
-    int *handle;
 
     error = get_session_dir(kDontCreateFolder, &sessVRefNum, &sessDirID);
 
     c2pstrcpy(psessionname, sessionname);
     error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &sessfile);
     if (error != noErr) goto out;
-    fd = FSpOpenResFile(&sessfile, fsRdPerm);
+    return open_settings_r_fsp(&sessfile);
+
+  out:
+    return NULL;
+}
+
+void *open_settings_r_fsp(FSSpec *sessfile)
+{
+    OSErr error;
+    int fd;
+    int *handle;
+
+    fd = FSpOpenResFile(sessfile, fsRdPerm);
     if (fd == 0) {error = ResError(); goto out;}
 
     handle = safemalloc(sizeof *handle);
@@ -217,11 +244,10 @@ void *open_settings_r(char *sessionname) {
     return NULL;
 }
 
-
 char *read_setting_s(void *handle, char *key, char *buffer, int buflen) {
     int fd;
     Handle h;
-    OSErr error;
+    size_t len;
 
     if (handle == NULL) goto out;
     fd = *(int *)handle;
@@ -230,8 +256,11 @@ char *read_setting_s(void *handle, char *key, char *buffer, int buflen) {
     h = get1namedresource(FOUR_CHAR_CODE('TEXT'), key);
     if (h == NULL) goto out;
 
-    if (GetHandleSize(h) > buflen) goto out;
-    p2cstrcpy(buffer, (StringPtr)*h);
+    len = GetHandleSize(h);
+    if (len + 1 > buflen) goto out;
+    memcpy(buffer, *h, len);
+    buffer[len] = '\0';
+
     ReleaseResource(h);
     if (ResError() != noErr) goto out;
     return buffer;
@@ -243,7 +272,6 @@ char *read_setting_s(void *handle, char *key, char *buffer, int buflen) {
 int read_setting_i(void *handle, char *key, int defvalue) {
     int fd;
     Handle h;
-    OSErr error;
     int value;
 
     if (handle == NULL) goto out;
@@ -339,6 +367,74 @@ void enum_settings_finish(void *handle) {
     safefree(handle);
 }
 
+#define SEED_SIZE 512
+
+void read_random_seed(noise_consumer_t consumer)
+{
+    short puttyVRefNum;
+    long puttyDirID;
+    OSErr error;
+    char buf[SEED_SIZE];
+    short refnum;
+    long count = SEED_SIZE;
+
+    if (get_putty_dir(kDontCreateFolder, &puttyVRefNum, &puttyDirID) != noErr)
+	return;
+    if (HOpenDF(puttyVRefNum, puttyDirID, "\pPuTTY Random Seed", fsRdPerm,
+		&refnum) != noErr)
+	return;
+    error = FSRead(refnum, &count, buf);
+    if (error != noErr && error != eofErr)
+	return;
+    (*consumer)(buf, count);
+    FSClose(refnum);
+}
+
+void write_random_seed(void *data, int len)
+{
+    short puttyVRefNum, tmpVRefNum;
+    long puttyDirID, tmpDirID;
+    OSErr error;
+    FSSpec dstfile, tmpfile;
+    short refnum;
+    long count = len;
+
+    if (get_putty_dir(kCreateFolder, &puttyVRefNum, &puttyDirID) != noErr)
+	return;
+
+    error = FSMakeFSSpec(puttyVRefNum, puttyDirID, "\pPuTTY Random Seed",
+			 &dstfile);
+    if (error != noErr && error != fnfErr) return;
+
+    /* Create a temporary file to save to first. */
+    error = FindFolder(puttyVRefNum, kTemporaryFolderType, kCreateFolder,
+		       &tmpVRefNum, &tmpDirID);
+    if (error != noErr) return;
+    error = FSMakeFSSpec(tmpVRefNum, tmpDirID, "\pPuTTY Random Seed",
+			 &tmpfile);
+    if (error != noErr && error != fnfErr) return;
+    if (error == noErr) {
+	error = FSpDelete(&tmpfile);
+	if (error != noErr) return;
+    }
+    error = FSpCreate(&tmpfile, PUTTY_CREATOR, SEED_TYPE, smRoman);
+    if (error != noErr) return;
+
+    if (FSpOpenDF(&tmpfile, fsWrPerm, &refnum) != noErr) goto fail;
+
+    if (FSWrite(refnum, &count, data) != noErr) goto fail2;
+    if (FSClose(refnum) != noErr) goto fail;
+
+    if (FSpExchangeFiles(&tmpfile, &dstfile) != noErr) goto fail;
+    if (FSpDelete(&tmpfile) != noErr) return;
+
+    return;
+    
+  fail2:
+    FSClose(refnum);
+  fail:
+    FSpDelete(&tmpfile);
+}
 
 /*
  * Emacs magic: