nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

There's something going wrong here. Occasional builds have difficulty loading

Browse Source 
the wordness resource.  I've added extra diagnostics, but I haven't worked out
what's going on.

[originally from svn r99]
This commit is contained in:
Ben Harris 1999-03-14 15:48:35 +00:00
parent eb79017bff
commit 07cf20654b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
maccfg.c
View File

@ -1,4 +1,4 @@
/* $Id: maccfg.c,v 1.1.2.1 1999/02/28 02:38:40 ben Exp $ */ /* $Id: maccfg.c,v 1.1.2.2 1999/03/14 15:48:35 ben Exp $ */
/* /*
* maccfg.c -- Mac port configuration * maccfg.c -- Mac port configuration
*/ */
@ -35,10 +35,11 @@ static void get_wordness(short id, short *dst) {
h = GetResource(PREF_wordness_type, id); h = GetResource(PREF_wordness_type, id);
if (h == NULL || *h == NULL) if (h == NULL || *h == NULL)
fatalbox ("Couldn't get wordness (%d)", ResError()); fatalbox ("Couldn't get wordness id %d (%d)", id, ResError());
memcpy(dst, *h, 256 * sizeof(short)); memcpy(dst, *h, 256 * sizeof(short));
} }
#pragma options align=mac68k
struct pSET { struct pSET {
unsigned long basic_flags; unsigned long basic_flags;
#define CLOSE_ON_EXIT 0x80000000 #define CLOSE_ON_EXIT 0x80000000
@ -71,6 +72,7 @@ struct pSET {
short colours_id; short colours_id;
short wordness_id; short wordness_id;
}; };
#pragma options align=reset
/* /*
* Load a configuration from the current chain of resource files. * Load a configuration from the current chain of resource files.
@ -80,8 +82,11 @@ void mac_loadconfig(Config *cfg) {
struct pSET *s; struct pSET *s;
h = GetResource('pSET', PREF_settings); h = GetResource('pSET', PREF_settings);
if (h == NULL) if (h == NULL || *h == NULL)
fatalbox("Can't load settings"); fatalbox("Can't load settings");
if (GetResourceSizeOnDisk(h) != sizeof(struct pSET))
fatalbox("Settings resource is wrong size (%d vs %d)",
GetResourceSizeOnDisk(h), sizeof(struct pSET));
SetResAttrs(h, GetResAttrs(h) | resLocked); SetResAttrs(h, GetResAttrs(h) | resLocked);
s = (struct pSET *)*h; s = (struct pSET *)*h;
/* Basic */ /* Basic */
@ -126,3 +131,10 @@ void mac_loadconfig(Config *cfg) {
SetResAttrs(h, GetResAttrs(h) & ~resLocked); SetResAttrs(h, GetResAttrs(h) & ~resLocked);
ReleaseResource(h); ReleaseResource(h);
} }
/*
* Emacs magic:
* Local Variables:
* c-file-style: "simon"
* End:
*/