-/* $Id: macstore.c,v 1.7 2003/01/08 22:46:12 ben Exp $ */
+/* $Id: macstore.c,v 1.10 2003/01/18 16:10:21 ben Exp $ */
/*
* macstore.c: Macintosh-specific impementation of the interface
#include "putty.h"
#include "storage.h"
#include "mac.h"
+#include "macresid.h"
#define PUTTY_CREATOR FOUR_CHAR_CODE('pTTY')
+#define INTERNAL_CREATOR FOUR_CHAR_CODE('pTTI')
#define SESS_TYPE FOUR_CHAR_CODE('Sess')
#define SEED_TYPE FOUR_CHAR_CODE('Seed')
return error;
}
+/* Copy a resource into the current resource file */
+static OSErr copy_resource(ResType restype, short resid)
+{
+ Handle h;
+ Str255 resname;
+
+ fprintf(stderr, "getting resource %x, id %d\n", restype, resid);
+ h = GetResource(restype, resid);
+ if (h != NULL) {
+ GetResInfo(h, &resid, &restype, resname);
+ DetachResource(h);
+ AddResource(h, restype, resid, resname);
+ if (ResError() == noErr)
+ WriteResource(h);
+ }
+ fprintf(stderr, "ResError() == %d\n", ResError());
+ return ResError();
+}
+
struct write_settings {
int fd;
FSSpec tmpfile;
FSSpec dstfile;
};
-void *open_settings_w(char *sessionname) {
+void *open_settings_w(char const *sessionname) {
short sessVRefNum, tmpVRefNum;
long sessDirID, tmpDirID;
OSErr error;
ws->fd = FSpOpenResFile(&ws->tmpfile, fsWrPerm);
if (ws->fd == -1) {error = ResError(); goto out;}
+ /* Set up standard resources. Doesn't matter if these fail. */
+ copy_resource('STR ', -16396);
+ copy_resource('TMPL', TMPL_Int);
+
return ws;
out:
fatalbox("Failed to open session for write (%d)", error);
}
-void write_setting_s(void *handle, char *key, char *value) {
+void write_setting_s(void *handle, char const *key, char const *value) {
int fd = *(int *)handle;
Handle h;
int id;
fatalbox("Failed to add resource %s (%d)", key, ResError());
}
-void write_setting_i(void *handle, char *key, int value) {
+void write_setting_i(void *handle, char const *key, int value) {
int fd = *(int *)handle;
Handle h;
int id;
safefree(handle);
}
-void *open_settings_r(char *sessionname)
+void *open_settings_r(char const *sessionname)
{
short sessVRefNum;
long sessDirID;
return NULL;
}
-char *read_setting_s(void *handle, char *key, char *buffer, int buflen) {
+char *read_setting_s(void *handle, char const *key, char *buffer, int buflen) {
int fd;
Handle h;
size_t len;
return NULL;
}
-int read_setting_i(void *handle, char *key, int defvalue) {
+int read_setting_i(void *handle, char const *key, int defvalue) {
int fd;
Handle h;
int value;
safefree(handle);
}
-void del_settings(char *sessionname) {
+void del_settings(char const *sessionname) {
OSErr error;
FSSpec sessfile;
short sessVRefNum;
FSClose(refnum);
}
+/*
+ * We don't bother with the usual FSpExchangeFiles dance here because
+ * it doesn't really matter if the old random seed gets lost.
+ */
void write_random_seed(void *data, int len)
{
- short puttyVRefNum, tmpVRefNum;
- long puttyDirID, tmpDirID;
+ short puttyVRefNum;
+ long puttyDirID;
OSErr error;
- FSSpec dstfile, tmpfile;
+ FSSpec dstfile;
short refnum;
long count = len;
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;
+ if (error == fnfErr) {
+ /* Set up standard resources */
+ FSpCreateResFile(&dstfile, INTERNAL_CREATOR, SEED_TYPE, smRoman);
+ refnum = FSpOpenResFile(&dstfile, fsWrPerm);
+ if (ResError() == noErr) {
+ copy_resource('STR ', -16397);
+ CloseResFile(refnum);
+ }
+ } else if (error != noErr) return;
+
+ if (FSpOpenDF(&dstfile, fsWrPerm, &refnum) != noErr) return;
+ FSWrite(refnum, &count, data);
+ FSClose(refnum);
return;
-
- fail2:
- FSClose(refnum);
- fail:
- FSpDelete(&tmpfile);
}
/*