-/* $Id: macstore.c,v 1.14 2003/02/01 15:44:08 ben Exp $ */
+/* $Id: macstore.c,v 1.19 2003/04/01 18:10:25 simon Exp $ */
/*
* macstore.c: Macintosh-specific impementation of the interface
FSSpec dstfile;
};
-void *open_settings_w(char const *sessionname) {
+void *open_settings_w(char const *sessionname, char **errmsg) {
short sessVRefNum;
long sessDirID;
OSErr error;
Str255 psessionname;
FSSpec dstfile;
-
+
+ *errmsg = NULL;
+
error = get_session_dir(kCreateFolder, &sessVRefNum, &sessDirID);
if (error != noErr) return NULL;
+ if (!sessionname || !*sessionname)
+ sessionname = "Default Settings";
c2pstrcpy(psessionname, sessionname);
error = FSMakeFSSpec(sessVRefNum, sessDirID, psessionname, &dstfile);
if (error == fnfErr) {
OSErr error;
Str255 tmpname;
- ws = smalloc(sizeof *ws);
+ ws = snew(struct write_settings);
ws->dstfile = *dstfile;
/* Create a temporary file to save to first. */
Handle h;
int id;
OSErr error;
+ Str255 pkey;
UseResFile(fd);
if (ResError() != noErr)
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());
}
Handle h;
int id;
OSErr error;
+ Str255 pkey;
UseResFile(fd);
if (ResError() != noErr)
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());
}
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;
fd = FSpOpenResFile(sessfile, fsRdPerm);
if (fd == 0) {error = ResError(); goto out;}
- handle = safemalloc(sizeof *handle);
+ handle = snew(int);
*handle = fd;
return handle;
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);
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);
sfree(settingname);
}
-int read_setting_filename(void *handle, const char *name, Filename *result)
+int read_setting_filename(void *handle, const char *key, Filename *result)
{
- return !!read_setting_s(handle, name, result->path, sizeof(result->path));
+ 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 *name, Filename result)
+void write_setting_filename(void *handle, const char *key, Filename fn)
{
- write_setting_s(handle, name, result.path);
+ 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) {
CloseResFile(fd);
if (ResError() != noErr)
fatalbox("Close of saved session failed (%d)", ResError());
- safefree(handle);
+ sfree(handle);
}
void del_settings(char const *sessionname) {