-/* $Id: macstore.c,v 1.15 2003/02/01 21:44:05 ben Exp $ */
+/* $Id: macstore.c,v 1.17 2003/03/27 22:46:28 ben Exp $ */
/*
* macstore.c: Macintosh-specific impementation of the interface
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) {
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 = smalloc(sizeof *handle);
*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)
{
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;
- h = (AliasHandle)get1namedresource(rAliasType, name);
+ 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));
return 0;
}
-void write_setting_filename(void *handle, const char *name, Filename fn)
+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)
/* Put the data in a resource. */
id = Unique1ID(rAliasType);
if (ResError() != noErr)
- fatalbox("Failed to get ID for resource %s (%d)", name, ResError());
- addresource((Handle)h, rAliasType, id, name);
+ 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)", name, ResError());
+ 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) {