preserve the old file in case the update is interrupted and replace it
atomically, so we just overwrite in place. Much simpler.
git-svn-id: svn://svn.tartarus.org/sgt/putty@2635
cda61777-01e9-0310-a592-
d414129be87e
-/* $Id: macstore.c,v 1.8 2003/01/14 19:09:24 ben Exp $ */
+/* $Id: macstore.c,v 1.9 2003/01/18 12:03:28 ben Exp $ */
/*
* macstore.c: Macintosh-specific impementation of the interface
/*
* macstore.c: Macintosh-specific impementation of the interface
+/*
+ * 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)
{
void write_random_seed(void *data, int len)
{
- short puttyVRefNum, tmpVRefNum;
- long puttyDirID, tmpDirID;
+ short puttyVRefNum;
+ long puttyDirID;
- FSSpec dstfile, tmpfile;
short refnum;
long count = len;
short refnum;
long count = len;
error = FSMakeFSSpec(puttyVRefNum, puttyDirID, "\pPuTTY Random Seed",
&dstfile);
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 == fnfErr)
+ error = FSpCreate(&dstfile, PUTTY_CREATOR, SEED_TYPE, smRoman);
if (error != noErr) return;
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 (FSpOpenDF(&dstfile, fsWrPerm, &refnum) != noErr) return;
- if (FSpExchangeFiles(&tmpfile, &dstfile) != noErr) goto fail;
- if (FSpDelete(&tmpfile) != noErr) return;
+ FSWrite(refnum, &count, data);
- fail:
- FSpDelete(&tmpfile);