X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/604379f16d657b55c695cca02d668bfe91d8e4ae..a460b361fe6734325bead016ef2dd39e4da302f4:/mac/macstore.c diff --git a/mac/macstore.c b/mac/macstore.c index 910b6c7e..30eb1cf3 100644 --- a/mac/macstore.c +++ b/mac/macstore.c @@ -1,4 +1,4 @@ -/* $Id: macstore.c,v 1.9 2003/01/18 12:03:28 ben Exp $ */ +/* $Id: macstore.c,v 1.17 2003/03/27 22:46:28 ben Exp $ */ /* * macstore.c: Macintosh-specific impementation of the interface @@ -11,15 +11,13 @@ #include #include +#include #include #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') +#include "macresid.h" OSErr FSpGetDirID(FSSpec *f, long *idp, Boolean makeit); @@ -95,6 +93,23 @@ OSErr FSpGetDirID(FSSpec *f, long *idp, Boolean makeit) { return error; } +/* Copy a resource into the current resource file */ +static OSErr copy_resource(ResType restype, short resid) +{ + Handle h; + Str255 resname; + + h = GetResource(restype, resid); + if (h != NULL) { + GetResInfo(h, &resid, &restype, resname); + DetachResource(h); + AddResource(h, restype, resid, resname); + if (ResError() == noErr) + WriteResource(h); + } + return ResError(); +} + struct write_settings { int fd; FSSpec tmpfile; @@ -102,30 +117,47 @@ struct write_settings { }; void *open_settings_w(char const *sessionname) { - short sessVRefNum, tmpVRefNum; - long sessDirID, tmpDirID; + short sessVRefNum; + long sessDirID; OSErr error; Str255 psessionname; - struct write_settings *ws; + FSSpec dstfile; - ws = safemalloc(sizeof *ws); error = get_session_dir(kCreateFolder, &sessVRefNum, &sessDirID); - if (error != noErr) goto out; + if (error != noErr) return NULL; + if (!sessionname || !*sessionname) + sessionname = "Default Settings"; c2pstrcpy(psessionname, sessionname); - error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &ws->dstfile); - if (error != noErr && error != fnfErr) goto out; + error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &dstfile); if (error == fnfErr) { - FSpCreateResFile(&ws->dstfile, PUTTY_CREATOR, SESS_TYPE, - smSystemScript); - if ((error = ResError()) != noErr) goto out; - } + FSpCreateResFile(&dstfile, PUTTY_CREATOR, SESS_TYPE, smSystemScript); + if ((error = ResError()) != noErr) return NULL; + } else if (error != noErr) return NULL; + + return open_settings_w_fsp(&dstfile); +} + +/* + * NB: Destination file must exist. + */ +void *open_settings_w_fsp(FSSpec *dstfile) +{ + short tmpVRefNum; + long tmpDirID; + struct write_settings *ws; + OSErr error; + Str255 tmpname; + + ws = smalloc(sizeof *ws); + ws->dstfile = *dstfile; /* Create a temporary file to save to first. */ - error = FindFolder(sessVRefNum, kTemporaryFolderType, kCreateFolder, - &tmpVRefNum, &tmpDirID); + error = FindFolder(ws->dstfile.vRefNum, kTemporaryFolderType, + kCreateFolder, &tmpVRefNum, &tmpDirID); if (error != noErr) goto out; - error = FSMakeFSSpec(tmpVRefNum, tmpDirID, psessionname, &ws->tmpfile); + c2pstrcpy(tmpname, tmpnam(NULL)); + error = FSMakeFSSpec(tmpVRefNum, tmpDirID, tmpname, &ws->tmpfile); if (error != noErr && error != fnfErr) goto out; if (error == noErr) { error = FSpDelete(&ws->tmpfile); @@ -137,6 +169,10 @@ void *open_settings_w(char const *sessionname) { 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: @@ -149,6 +185,7 @@ void write_setting_s(void *handle, char const *key, char const *value) { Handle h; int id; OSErr error; + Str255 pkey; UseResFile(fd); if (ResError() != noErr) @@ -161,7 +198,8 @@ void write_setting_s(void *handle, char const *key, char const *value) { id = Unique1ID(FOUR_CHAR_CODE('TEXT')); if (ResError() != noErr) fatalbox("Failed to get ID for resource %s (%d)", key, ResError()); - addresource(h, FOUR_CHAR_CODE('TEXT'), id, key); + c2pstrcpy(pkey, key); + AddResource(h, FOUR_CHAR_CODE('TEXT'), id, pkey); if (ResError() != noErr) fatalbox("Failed to add resource %s (%d)", key, ResError()); } @@ -171,6 +209,7 @@ void write_setting_i(void *handle, char const *key, int value) { Handle h; int id; OSErr error; + Str255 pkey; UseResFile(fd); if (ResError() != noErr) @@ -185,7 +224,8 @@ void write_setting_i(void *handle, char const *key, int value) { id = Unique1ID(FOUR_CHAR_CODE('Int ')); if (ResError() != noErr) fatalbox("Failed to get ID for resource %s (%d)", key, ResError()); - addresource(h, FOUR_CHAR_CODE('Int '), id, key); + c2pstrcpy(pkey, key); + AddResource(h, FOUR_CHAR_CODE('Int '), id, pkey); if (ResError() != noErr) fatalbox("Failed to add resource %s (%d)", key, ResError()); } @@ -218,6 +258,8 @@ void *open_settings_r(char const *sessionname) error = get_session_dir(kDontCreateFolder, &sessVRefNum, &sessDirID); + if (!sessionname || !*sessionname) + sessionname = "Default Settings"; c2pstrcpy(psessionname, sessionname); error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &sessfile); if (error != noErr) goto out; @@ -236,7 +278,7 @@ void *open_settings_r_fsp(FSSpec *sessfile) fd = FSpOpenResFile(sessfile, fsRdPerm); if (fd == 0) {error = ResError(); goto out;} - handle = safemalloc(sizeof *handle); + handle = smalloc(sizeof *handle); *handle = fd; return handle; @@ -248,12 +290,14 @@ char *read_setting_s(void *handle, char const *key, char *buffer, int buflen) { int fd; Handle h; size_t len; + Str255 pkey; if (handle == NULL) goto out; fd = *(int *)handle; UseResFile(fd); if (ResError() != noErr) goto out; - h = get1namedresource(FOUR_CHAR_CODE('TEXT'), key); + c2pstrcpy(pkey, key); + h = Get1NamedResource(FOUR_CHAR_CODE('TEXT'), pkey); if (h == NULL) goto out; len = GetHandleSize(h); @@ -273,12 +317,14 @@ int read_setting_i(void *handle, char const *key, int defvalue) { int fd; Handle h; int value; + Str255 pkey; if (handle == NULL) goto out; fd = *(int *)handle; UseResFile(fd); if (ResError() != noErr) goto out; - h = get1namedresource(FOUR_CHAR_CODE('Int '), key); + c2pstrcpy(pkey, key); + h = Get1NamedResource(FOUR_CHAR_CODE('Int '), pkey); if (h == NULL) goto out; value = *(int *)*h; ReleaseResource(h); @@ -289,6 +335,135 @@ int read_setting_i(void *handle, char const *key, int defvalue) { return defvalue; } +int read_setting_fontspec(void *handle, const char *name, FontSpec *result) +{ + char *settingname; + FontSpec ret; + char tmp[256]; + + if (!read_setting_s(handle, name, tmp, sizeof(tmp))) + return 0; + c2pstrcpy(ret.name, tmp); + settingname = dupcat(name, "Face", NULL); + ret.face = read_setting_i(handle, settingname, 0); + sfree(settingname); + settingname = dupcat(name, "Height", NULL); + ret.size = read_setting_i(handle, settingname, 0); + sfree(settingname); + if (ret.size == 0) return 0; + *result = ret; + return 1; +} + +void write_setting_fontspec(void *handle, const char *name, FontSpec font) +{ + char *settingname; + char tmp[256]; + + p2cstrcpy(tmp, font.name); + write_setting_s(handle, name, tmp); + settingname = dupcat(name, "Face", NULL); + write_setting_i(handle, settingname, font.face); + sfree(settingname); + settingname = dupcat(name, "Size", NULL); + write_setting_i(handle, settingname, font.size); + sfree(settingname); +} + +int read_setting_filename(void *handle, const char *key, Filename *result) +{ + int fd; + AliasHandle h; + Boolean changed; + OSErr err; + Str255 pkey; + + if (handle == NULL) goto out; + fd = *(int *)handle; + UseResFile(fd); + if (ResError() != noErr) goto out; + c2pstrcpy(pkey, key); + h = (AliasHandle)Get1NamedResource(rAliasType, pkey); + if (h == NULL) goto out; + if ((*h)->userType == 'pTTY' && (*h)->aliasSize == sizeof(**h)) + memset(result, 0, sizeof(*result)); + else { + err = ResolveAlias(NULL, h, &result->fss, &changed); + if (err != noErr && err != fnfErr) goto out; + if ((*h)->userType == 'pTTY') { + long dirid; + StrFileName fname; + + /* Tail of record is pascal string contaning leafname */ + if (FSpGetDirID(&result->fss, &dirid, FALSE) != noErr) goto out; + memcpy(fname, (char *)*h + (*h)->aliasSize, + GetHandleSize((Handle)h) - (*h)->aliasSize); + err = FSMakeFSSpec(result->fss.vRefNum, dirid, fname, + &result->fss); + if (err != noErr && err != fnfErr) goto out; + } + } + ReleaseResource((Handle)h); + if (ResError() != noErr) goto out; + return 1; + + out: + return 0; +} + +void write_setting_filename(void *handle, const char *key, Filename fn) +{ + int fd = *(int *)handle; + AliasHandle h; + int id; + OSErr error; + Str255 pkey; + + UseResFile(fd); + if (ResError() != noErr) + fatalbox("Failed to open saved session (%d)", ResError()); + + if (filename_is_null(fn)) { + /* Generate a special "null" alias */ + h = (AliasHandle)NewHandle(sizeof(**h)); + if (h == NULL) + fatalbox("Failed to create fake alias"); + (*h)->userType = 'pTTY'; + (*h)->aliasSize = sizeof(**h); + } else { + error = NewAlias(NULL, &fn.fss, &h); + if (error == fnfErr) { + /* + * NewAlias can't create an alias for a nonexistent file. + * Create an alias for the directory, and record the + * filename as well. + */ + FSSpec tmpfss; + + FSMakeFSSpec(fn.fss.vRefNum, fn.fss.parID, NULL, &tmpfss); + error = NewAlias(NULL, &tmpfss, &h); + if (error != noErr) + fatalbox("Failed to create alias"); + (*h)->userType = 'pTTY'; + SetHandleSize((Handle)h, (*h)->aliasSize + fn.fss.name[0] + 1); + if (MemError() != noErr) + fatalbox("Failed to create alias"); + memcpy((char *)*h + (*h)->aliasSize, fn.fss.name, + fn.fss.name[0] + 1); + } + if (error != noErr) + fatalbox("Failed to create alias"); + } + /* Put the data in a resource. */ + id = Unique1ID(rAliasType); + if (ResError() != noErr) + fatalbox("Failed to get ID for resource %s (%d)", key, ResError()); + c2pstrcpy(pkey, key); + AddResource((Handle)h, rAliasType, id, pkey); + if (ResError() != noErr) + fatalbox("Failed to add resource %s (%d)", key, ResError()); +} + void close_settings_r(void *handle) { int fd; @@ -297,7 +472,7 @@ void close_settings_r(void *handle) { CloseResFile(fd); if (ResError() != noErr) fatalbox("Close of saved session failed (%d)", ResError()); - safefree(handle); + sfree(handle); } void del_settings(char const *sessionname) { @@ -408,15 +583,20 @@ void write_random_seed(void *data, int len) error = FSMakeFSSpec(puttyVRefNum, puttyDirID, "\pPuTTY Random Seed", &dstfile); - if (error == fnfErr) - error = FSpCreate(&dstfile, PUTTY_CREATOR, SEED_TYPE, smRoman); - if (error != 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; }