dfont2res didn't work on some dfonts. would produce a bad bin file.

2 files changed, 3 insertions, 5 deletions

diff --git a/Makefile.Mac b/Makefile.Mac
index f26ab34..11f1505 100644
--- a/Makefile.Mac
+++ b/Makefile.Mac
@@ -15,9 +15,6 @@ all: fondu ufond showfond dfont2res
 fondu: $(FONDUOBJS)
 	$(CC) $(CFLAGS) -o fondu $(FONDUOBJS) $(CORE)
 
-res2data: res2data.o
-	$(CC) $(CFLAGS) -o res2data res2data.o $(CORE)
-
 ufond: $(UFONDOBJS)
 	$(CC) $(CFLAGS) -o ufond $(UFONDOBJS)
 
diff --git a/dfont2res.c b/dfont2res.c
index a1da9ea..ec84587 100644
--- a/dfont2res.c
+++ b/dfont2res.c
@@ -138,6 +138,7 @@ static void DumpMacBinaryHeader(FILE *res,struct macbinaryheader *mb) {
 static void CopyFile(FILE *out, FILE *in, char *filename) {
     struct macbinaryheader header;
     char buffer[1024], *pt;
+    unsigned char ubuf[16];
     int len, map_pos;
 
     memset(buffer,0,128);
@@ -149,8 +150,8 @@ static void CopyFile(FILE *out, FILE *in, char *filename) {
     /* dfonts have a slightly different map header than do resource forks */
     /*  make the header appropriate for a fork */
     rewind(in);
-    fread(buffer,1,16,in);
-    map_pos = 128 + ((buffer[4]<<24)|(buffer[5]<<16)|(buffer[6]<<8)|buffer[7]);
+    fread(ubuf,1,16,in);
+    map_pos = 128 + ((ubuf[4]<<24)|(ubuf[5]<<16)|(ubuf[6]<<8)|ubuf[7]);
     fseek(out,map_pos,SEEK_SET);
     fwrite(buffer,1,16,out);