From acb021e864ad165d40b8642809b383551e5bfc7e Mon Sep 17 00:00:00 2001
From: Will Nayes <wnayes@gmail.com>
Date: Thu, 22 Mar 2018 20:02:26 -0500
Subject: [PATCH] macunpack now compiles, most warnings fixed.

---
 .gitignore              |   3 +++
 macunpack/arc.h         |   0
 macunpack/bin.c         |   1 +
 macunpack/bits_be.c     |   0
 macunpack/bits_be.h     |   0
 macunpack/cpt.c         |   5 +----
 macunpack/cpt.h         |   4 ++--
 macunpack/cpt.o         | Bin 20616 -> 0 bytes
 macunpack/crc.c         |   0
 macunpack/crc.h         |   0
 macunpack/dd.c          |   8 +++-----
 macunpack/dd.h          |   4 ++--
 macunpack/de_compress.c |   0
 macunpack/de_huffman.c  |   0
 macunpack/de_lzah.c     |   0
 macunpack/de_lzh.c      |   0
 macunpack/dia.c         |   5 ++---
 macunpack/dia.h         |   0
 macunpack/dia.o         | Bin 15248 -> 0 bytes
 macunpack/dir.c         |   4 +---
 macunpack/dir.o         | Bin 3952 -> 0 bytes
 macunpack/globals.c     |   0
 macunpack/globals.h     |   0
 macunpack/huffman.h     |   0
 macunpack/jdw.c         |   0
 macunpack/jdw.h         |   2 +-
 macunpack/lzc.c         |   1 +
 macunpack/lzc.h         |   3 +--
 macunpack/lzh.c         |  11 +++--------
 macunpack/lzh.h         |  10 +---------
 macunpack/macbinary.c   |   1 +
 macunpack/macunpack.c   |   1 +
 macunpack/macunpack.h   |   0
 macunpack/macunpack.o   | Bin 10808 -> 0 bytes
 macunpack/makefile      |   4 ++--
 macunpack/mcb.c         |   0
 macunpack/pit.c         |   1 +
 macunpack/pit.h         |   0
 macunpack/sit.c         |   3 ++-
 macunpack/sit.h         |   6 ++----
 macunpack/stf.c         |   1 +
 macunpack/stf.h         |   3 +--
 macunpack/zma.c         |   4 ++--
 macunpack/zma.h         |   2 +-
 macunpack/zma.o         | Bin 14976 -> 0 bytes
 macunpack/zmahdr.h      |   0
 makefile                |   3 +--
 47 files changed, 37 insertions(+), 53 deletions(-)
 create mode 100644 .gitignore
 mode change 100755 => 100644 macunpack/arc.h
 mode change 100755 => 100644 macunpack/bin.c
 mode change 100755 => 100644 macunpack/bits_be.c
 mode change 100755 => 100644 macunpack/bits_be.h
 mode change 100755 => 100644 macunpack/cpt.c
 mode change 100755 => 100644 macunpack/cpt.h
 delete mode 100644 macunpack/cpt.o
 mode change 100755 => 100644 macunpack/crc.c
 mode change 100755 => 100644 macunpack/crc.h
 mode change 100755 => 100644 macunpack/dd.c
 mode change 100755 => 100644 macunpack/dd.h
 mode change 100755 => 100644 macunpack/de_compress.c
 mode change 100755 => 100644 macunpack/de_huffman.c
 mode change 100755 => 100644 macunpack/de_lzah.c
 mode change 100755 => 100644 macunpack/de_lzh.c
 mode change 100755 => 100644 macunpack/dia.c
 mode change 100755 => 100644 macunpack/dia.h
 delete mode 100644 macunpack/dia.o
 mode change 100755 => 100644 macunpack/dir.c
 delete mode 100644 macunpack/dir.o
 mode change 100755 => 100644 macunpack/globals.c
 mode change 100755 => 100644 macunpack/globals.h
 mode change 100755 => 100644 macunpack/huffman.h
 mode change 100755 => 100644 macunpack/jdw.c
 mode change 100755 => 100644 macunpack/jdw.h
 mode change 100755 => 100644 macunpack/lzc.c
 mode change 100755 => 100644 macunpack/lzc.h
 mode change 100755 => 100644 macunpack/lzh.c
 mode change 100755 => 100644 macunpack/lzh.h
 mode change 100755 => 100644 macunpack/macbinary.c
 mode change 100755 => 100644 macunpack/macunpack.c
 mode change 100755 => 100644 macunpack/macunpack.h
 delete mode 100644 macunpack/macunpack.o
 mode change 100755 => 100644 macunpack/makefile
 mode change 100755 => 100644 macunpack/mcb.c
 mode change 100755 => 100644 macunpack/pit.c
 mode change 100755 => 100644 macunpack/pit.h
 mode change 100755 => 100644 macunpack/sit.c
 mode change 100755 => 100644 macunpack/sit.h
 mode change 100755 => 100644 macunpack/stf.c
 mode change 100755 => 100644 macunpack/stf.h
 mode change 100755 => 100644 macunpack/zma.c
 mode change 100755 => 100644 macunpack/zma.h
 delete mode 100644 macunpack/zma.o
 mode change 100755 => 100644 macunpack/zmahdr.h

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..11b0518
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.o
+macunpack/macunpack
+
diff --git a/macunpack/arc.h b/macunpack/arc.h
old mode 100755
new mode 100644
diff --git a/macunpack/bin.c b/macunpack/bin.c
old mode 100755
new mode 100644
index 86fb1f0..50cf3be
--- a/macunpack/bin.c
+++ b/macunpack/bin.c
@@ -1,5 +1,6 @@
 #include "macunpack.h"
 #ifdef BIN
+#include <string.h>
 #include "globals.h"
 #include "../fileio/machdr.h"
 #include "../fileio/wrfile.h"
diff --git a/macunpack/bits_be.c b/macunpack/bits_be.c
old mode 100755
new mode 100644
diff --git a/macunpack/bits_be.h b/macunpack/bits_be.h
old mode 100755
new mode 100644
diff --git a/macunpack/cpt.c b/macunpack/cpt.c
old mode 100755
new mode 100644
index 5514302..bdeb8d4
--- a/macunpack/cpt.c
+++ b/macunpack/cpt.c
@@ -5,6 +5,7 @@
 #endif /* CPT */
 #endif /* DD */
 #ifdef CPT
+#include <stdlib.h>
 #include "globals.h"
 #include "cpt.h"
 #include "crc.h"
@@ -21,10 +22,6 @@
 #define ESC1SEEN	1
 #define ESC2SEEN	2
 
-extern char *malloc();
-extern char *realloc();
-extern int free();
-
 static void cpt_uncompact();
 static unsigned char *cpt_data;
 static unsigned long cpt_datamax;
diff --git a/macunpack/cpt.h b/macunpack/cpt.h
old mode 100755
new mode 100644
index 43700b8..89f233d
--- a/macunpack/cpt.h
+++ b/macunpack/cpt.h
@@ -40,7 +40,7 @@ typedef struct cptHdr {			/* 8 bytes */
 	unsigned long	hdrcrc;		/* header crc */
 	unsigned short	entries;	/* number of index entries */
 	unsigned char	commentsize;	/* number of bytes comment that follow*/
-};
+} cptHdr;
 
 typedef struct fileHdr {		/* 78 bytes */
 	unsigned char	fName[32];	/* a STR32 */
@@ -61,7 +61,7 @@ typedef struct fileHdr {		/* 78 bytes */
 	unsigned long	dataLength;
 	unsigned long	compRLength;	/* compressed lengths */
 	unsigned long	compDLength;
-};
+} fileHdr;
 
 
 /* file format is:
diff --git a/macunpack/cpt.o b/macunpack/cpt.o
deleted file mode 100644
index 4268419f96d1586df2901cc4057409a534bd1085..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20616
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

diff --git a/macunpack/crc.c b/macunpack/crc.c
old mode 100755
new mode 100644
diff --git a/macunpack/crc.h b/macunpack/crc.h
old mode 100755
new mode 100644
diff --git a/macunpack/dd.c b/macunpack/dd.c
old mode 100755
new mode 100644
index 28f417d..fd16f99
--- a/macunpack/dd.c
+++ b/macunpack/dd.c
@@ -1,5 +1,7 @@
 #include "macunpack.h"
 #ifdef DD
+#include <stdlib.h>
+#include <string.h>
 #include "globals.h"
 #include "dd.h"
 #include "crc.h"
@@ -9,10 +11,6 @@
 #include "../util/masks.h"
 #include "../util/util.h"
 
-extern char *malloc();
-extern char *realloc();
-extern char *strcpy();
-extern char *strncpy();
 extern void cpt_wrfile1();
 extern void core_compress();
 extern void de_compress();
@@ -48,7 +46,7 @@ static void dd_cpt_compat();
 typedef struct methodinfo {
 	char *name;
 	int number;
-};
+} methodinfo;
 
 static struct methodinfo methods[] = {
     {"NoComp",  nocomp},
diff --git a/macunpack/dd.h b/macunpack/dd.h
old mode 100755
new mode 100644
index 1fc0453..b608f6c
--- a/macunpack/dd.h
+++ b/macunpack/dd.h
@@ -71,7 +71,7 @@ typedef struct fileHdr {		/* 124 bytes */
 	unsigned short	datacrc;	/* checksum */
 	unsigned short	rsrccrc;
 	unsigned short	hdrcrc;		/* true crc */
-};
+} fileHdr;
 
 typedef struct fileCHdr {		/* 84 bytes */
 	unsigned char	magic[4];	/* "\253\315\000\124" */
@@ -101,7 +101,7 @@ typedef struct fileCHdr {		/* 84 bytes */
 	unsigned short	datacrc2;	/* other checksum */
 	unsigned short	rsrccrc2;
 	unsigned short	hdrcrc;		/* true crc */
-};
+} fileCHdr;
 
 #define	DD_FILE	0
 #define	DD_COPY	1
diff --git a/macunpack/de_compress.c b/macunpack/de_compress.c
old mode 100755
new mode 100644
diff --git a/macunpack/de_huffman.c b/macunpack/de_huffman.c
old mode 100755
new mode 100644
diff --git a/macunpack/de_lzah.c b/macunpack/de_lzah.c
old mode 100755
new mode 100644
diff --git a/macunpack/de_lzh.c b/macunpack/de_lzh.c
old mode 100755
new mode 100644
diff --git a/macunpack/dia.c b/macunpack/dia.c
old mode 100755
new mode 100644
index 984eff3..0ad0616
--- a/macunpack/dia.c
+++ b/macunpack/dia.c
@@ -1,5 +1,7 @@
 #include "macunpack.h"
 #ifdef DIA
+#include <stdlib.h>
+#include <string.h>
 #include "globals.h"
 #include "dia.h"
 #include "../util/curtime.h"
@@ -9,9 +11,6 @@
 #include "../fileio/kind.h"
 #include "../util/util.h"
 
-extern char *malloc();
-extern char *realloc();
-
 static unsigned char *dia_archive;
 static int dia_archive_size;
 static int dia_max_archive_size;
diff --git a/macunpack/dia.h b/macunpack/dia.h
old mode 100755
new mode 100644
diff --git a/macunpack/dia.o b/macunpack/dia.o
deleted file mode 100644
index 43618dbbc08f674f2cddbda583846f6dc31639ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15248
zcmb`NeRLF6mcXmJLq0He#Sxv%fYM?|6U3M(B8a%@(1D5;AFJRe*o02U^dVn%S8L!f
z0qiuJnplW)bcdt6bH-Vn;mmOdXLnCjRLF;b?#v*5j5EqEi;5#Lkq=QsL3{6g^<L-l
zl5+iHA5_(=U)^`#z4v`qb=K7w^E|4mh@>hvDkFD-D$2g=M)FlGTcv1<PuVbs-9Qm@
zV)q4@*Sp8zMe9*6*{8l~F*cy5u0*KrVb8FFp*MoJ2X6~54K7)FtG;2l3y^M|(yg_D
zBHc0r#r1mk4JD<Ft_`$TX7ui2qx(kP`k&{4DTnc7g#v|hGV2tjqkTK*R?7OVC4s{9
zn;jS1H)ZrxpUOnFo+VySuxmn|p6XTgS$)YPdISpU-D?BIx|)|d7gebaOZ9q?7XjD1
zLxJ{s{hAzRgqB|C1p_y{f_C1$Jh&{lJa|tqJYd)fkG{oFk7+%NGa;>K#kaw}L;1mi
zw}TtbWHJzxcHLh5t!`Imbg<U1^;BoNSO|2R1x~lvC1kz-<r}H@^Pb1ZymioGB95a^
ze4ELnd$q>~w4VLC%^uXG4{4iHAgSApnHsw(kTL8P-!3Q{HXwSX1~}j!s?~b*Z=mio
zXw(_Us6Pfbyn;pzHf1uIpw=@#(^aD^u-9drnku0t>%G(o6{-upr>8zujaeU=<J0@i
zw|3V+gT0ID{iwc_8)B3l*1H`)%JyLEy#Wmv3Y1#A)4d&+a3TA)jBe{Wx;^2MJzz6f
zo$AfeXYETK$C!gEr`Omy4+dW@g2%y^FbG&zMXj~RfW9y@Xq_A?s8J6E!6viRu)Yad
zCsISIJr_*v_!unBaXe`K24iI&3Kc|^p#x}Xh0zV=x8JsO=~8UiQtQ;0pIE2*PE9WB
z-xCT{K}8B&L;R}qtASVON9Do==uUPUxG;UwP=RCqZu7kE{M1+8b;tC`YpKvfRqD{+
z^hm$nchF-v9@VP-hPn^qu~?57fhyh3>B74^@Gd0oR^Xj3?i%sVFziWP={L1aFM$=<
zbL?s99LO5h*Fol|ZeN534kc^4&skvKofEQGfZH8c*zM5k_c*;Cns<6`Ro8Tn)9d#n
zkA$p)n6FiL>uSFqIj(>C&VtBmM%i9neJA}|`(*1iGGuOmvN!OueaWLxq83`sn6=Bi
zvbwv_JGVQ>1I}v?uYsPVN50a#%`=M)dtr`Y8D|!Ux_yI<@Bj?PQRFwuj)7@lVZd$!
z3wLKNEX?gH<dqyt9<{*JCD*G)+1D6IXswaq=^0!G!-)-gHd~aghtYo;rU++r>Q-l<
z7*J)eGrwST#>%BKYR5e<<5V$pr8Dk58`y}#NyM)9sO(0Mys4-9J-W&|X6m$RUIm?v
zcXX$tVFgydGxzjZpOp3US!C#0s3N(TPl39X6VUBtIH4^I<m<KxC+lNJL*{D;90Vs{
zFZ(O6wi~3ae*Fqoty8(~%mjM3<6m|<N{)xA2!n9<@&Oi=bf#lIL?$(yZ-+C?!_oGF
znapBsQNO+gx&nB}`~~Myr!&dDdg_&Y(05{hOw6g__Mml!1UeLGtnAg(C$-K?p-=Mh
zq1&6m7G*aZ+c3xWCqLJEa#IH<!{l?=neS@SpLUc4?FA$AGM@oqdd^j|v-7La*Tni!
z)WsqJGpm}-d9pcgHkXsljmze8v$;Gc2U8&gpD7HUe5FY1ybtDcP@SI@EXd}@XLILd
zbA{R5x!IgAo70>e1Qpua2`ZZw74s^+n=LSW;9d)1f@&v##}#a3rcUL8%c;Ix-C}Yt
zq5xQ!Z(jN$&V!KkB#T9dvKOn|39Y9%HK0OEGm#wg(wDikI<|CaYL^=7E<t%*KGJ{o
zz=Yz=-C{}o6$~*a_ApE3@Mkaz9S1BUP-Go-I&V8jhPs(AS+Pl3u?dE=s2P#90hkbA
z^<%LZ89B9)y*j9a_Sie>S;~o<);Sf|TYGJwDr9|vy8^#Hh9;->5zV@71ZHf<$r39l
z9jgKZ*2~#U#ITNxsvbvBZDjXi1Lolg3oKaPjKEC2dr6=|x0%1Ah82vOqO8$(K_iS<
z6SQ_gx7X59h;>$E3mWIdYI`2!cVN45JJ?W8LDUqjvlTdGi&U+1BhPxwi$ux%u}U^*
zM|(fhriKE=pJ{ipUI^qhAVwhPGwq%}$px&K)yRze0&Yc5_}%GDMi`u)iVt|hKSmyO
z{uT}Ao`8p=JsIo*8q#*Kt>0h(I?YZ1PMx~FW&N`yYjx|u=r$OG4L$><xk*9o(OorK
z&!@W619y%WItMr54u)?KKY<BWn0<gxwvE{dR7;nG$<TJ~WHTq6!O)Frmce&GxsdRU
zDe)g5QDc2Hcm$pb$+30a0WlR4W9ynhB*qLbHd^Q9u*wcD1<@cI{%pLA^gp)#;-VuD
zz--$lV8b*bAF?Bv^!|<#zQ2&$#`qj|jj3TZm^zb5ejs#oK1RG9vs>2SYB3D4f$ls3
zy0aII#_ad*&XdmS&OvSJ-v6sNciw!KWA^e4EI*g(HtUJHH15q4V2`r~9ui)q*Mq$y
zkr~_p`q)^(HMZic^{^Dz!;IGXG{(W%pv&vwK3os;U_I1&_BqQTY%WXe_{e6+a0+TY
zMxGk%D#Sf9tfR-0N4P;|zMf(udV(`U!xlaL3RK9}2riSnDr^0G>^;`Ue83Yw%He^w
z;{qtD3_Yb=AC9y!^KR69YP}~-8d#Ev3d1IkXtxH^y~&c1SG>Vq5FRy39g~?e>flY-
z7kX7^%^che@~MOCy7ESxd>c@Dzt;I@e8ieh6<&7!4%ldmKX9{n@DY%|p~}ol9ag*Y
zhMvH^GJpRX+60ZG+o3!F%reI*jSYFWBI&c)MN8Fz#n70Yy;|4bLw0Lb@|msvWUp>N
zplUt0tEmq_&yovAmg!TDs;wt8nW2AYksH*}>BHP<+ys_p=cQyW%t;k@JDWQGatuq7
zZk-<4&$@In*mOA);%v51b<7s8X4pAxX!ntZ65GmbByok|OFwg8kFYMnrzmGGbRx|>
z5RYf=)6#M5Q9W~2*y{Dde|SgozJL=JpL9<ATKjpg_Ot%7ecF!RAiN8wdqY~NKO}aA
zy&V^`mtNjz*zF_xw4TEAy9zH1&Fbwq!nZ!4-Vbjuse@HeiPJ`~HLB3kKZ5#kzoeyc
z$_!Z_rasKGSE<&~zK^vszHEUxO0Bg^?4qy|M}=XrE;SO{@0cbQ937b^c)6O+Lt5A0
zP`O<rRKknbPm~>4qZ99KFl!ptQ73L}hm9W(2COefHOF8R>u%>_+3gtrQESjn@Q^Q`
zeBGV!{lrSYpIG3##n|fYnEeH;sDmZYk6Y@RqjRQ|B&JOBo2%QRb4sR{Pftwq*Coxy
z*0{K<uQTiBlr+^(^T!kM2<DUp$tE*)Wg>cSbF{_u*To}^vHPP5e@m<Bk2SY7MG;5q
z%W-XIsiq|oU)=`iyJQPOP|@{%CEDC(u2vSd`XjB)ZSiO#5o>Kx7T3kiSY4A}G47go
zbM^@+ECrh@8%j#blxhB3z&=m_^)|FN)kovZHKi$9cYmzqUcbZq=<ax>wk45lXoy8(
z=s<I{xi!8Tip{NSx!m-}qjgzB0s7(d6iatjDf8#fz209sf8o+H|8?cplvnU4*pQgi
zHMb~gdyzV^FfV^IG&g<`nZ%wb%4~ks;VR0_z|C&8ujpY<wXb-Sx7z2obE<u%4~+}@
zDmLZ@eKS*e^L@RlXX|+1Oh7?jDTsh56sh**2hW)X#n*DZ7h?Ac`ieGsg1+LE7s{>o
zc*m*ZeZ>HSD6J^ilb+%73-DT#l@Iy+9a+%<cp1C{9{-igPQtzJciS2AJ*#?;dwkEU
zA+Wdw?_Pq+$242<gSzQxFQg`%Z@|QqC*-U0uJDZK*3JZsJ1tC4p$yb-W1JrH27UgG
zIS`E0xR9^H`v<6|6cD&A;=&4zaYA)D%5nILHadC7{Bo)&Uiddw@`5HgVVFEbk7)Dr
zfvZGbl)Q-Ze6C1br*b`_JnJXG@G~yzDSD1g^jVG7oUizqqj__{2^_XD%KPDpsfs_p
z9r9@BecTY%cYsCVK>5#m&em^oeoW$>oab|Ug#C{KNB#fcs8Lv71BS_~aOm7-&t4@r
zn-`fUA%l9}=0#XP1com!ES^%mFK|9Viq8PobF2_DkXWCC>s~le&nfPgu>Sz(#gd*A
zocpDE0fS%I`lFLqDHsibc$Mt*n0@Ya%+c}5Va+)@J_Vd(KcdOU_-K31=kk|PVaOMA
zUMum7I2UmdkEd{sZ$C6$&UqDuke|l6A@NGiajv21I?lIH2>CgjH%ojj=P8NTGCoeh
zxrC-goHtU)^Ik>vR#EUJ4d-$>t#aXQF8rhm-{8W3>cSs(;g7oTCtdh2T=-TOzRiVi
zcj3>u@Lm`GstbSJg}?2>54i9{F8r7aKkdSEVLckFKlohuk6ic^7k-5czZ&=tV8&Xe
zIX#iBi;$h+B0txK-|WH{yYSmw_;MG%(uFJavAXgIp2M)SyMJZOWcgTgU1Al>0ST|H
zOGMety-{;zQ)|R|(j0|7X}u6ynQUNL<1Vvqr4Vk4w%ltrvb%=X_$qQ6k?#49HQZ*#
znRsGVtPMq+vau$o{zljbM&ntbhFD8OE7y*@OP1v_O?3&!mFBwku+W}}t#K4_pp+YP
zEAUi_r|EdQ7Ed$qG!su(<LMeaU5BSxc&c=YFj~n<Rx+_lrl9g#B|P6)R2?+Ji{{O{
zwPs0pNwC_e2`do1tCes#Vb(=fg(Hot!VPt?CNMc3MrW0_q&Zz_ih<Q;ysjmIF9J$^
zYdF?Y4;x}7VS;~grJ*ezYcV0xt>OEU(fDfR{%Cw<E3{6-1M!#{Rm>Qa!l;B>Tbfpb
zc+!N%jY6QJVWtskkDH(r;^t)WT|#M1nk=Xe!j}pq+EO2GU~z8^H?IOKk>CZo3e*tB
za$y!v*qk>(r@(64lm^_YE6ompo2U|Phdu>+1}EVaw>YQZT?dm`uLOtBk}R?JWsnn`
zZ;O;Ej+!hN^0+_4B;>^ovC_d=F6wRP9Q9rWhtPxj5==tRIecFs_Qrw_@%_ncn2)Hu
z;MEcr_TMgXQ7^7fW9j)y;-Bz(y=Vv|VUN&%vBbr@PRND7@4_$S0TlX$o(Ej`N^XFV
z7jbLm9548eCH#Fvk{A2cCnP@1{e4>EhdF;y;-cPui3>fiyYT;(cn)v(VHbXqbG*?0
zQ^2>1avX{!F7(fnxY*Axk+_h*OX9+>I*AK;=PRc(=4kx?$wmIxoXdXgbdgv278w1-
zu_oF#AaVHK%hDW)!zUV+mJ*J2pW*F$58<eveKmw@qr`6nhAA%bzjLs%R^nBhZ<KhD
z^UV^k=KOJq&*l6niHA7fMmY6rfN=B+-~TZEN#bH3{uhbg>4+=uOZ+a*ha`SC=U+&C
z8Rr>^FXy~~zp{w-y@&G&gj2tMEOCvGqkzOk`&JN+aj4<?4Z^AZm<u;u_|IMVuUz;x
z!mkEfM1S5%INBq|*BcTS<9ENr#W?*);)OguXCyB4c=)T2m`{YBLWv7KKa{wz^D@FQ
z&Wm`QD>z4=u7N}NTP?}o%H<6g`CEwmbdZG~Hd$&T9P1V1eGSor-`7RG>xujf!hcHS
z@tcc~{}&>U`o;Y4uSA~e?~~-kc>jZo{4kNncY0Cp3BvJRR`73#o>_$F@lOuej@QE>
z;#15y#vi{e2|ZJZ{0&5YCgHT+TEZ_TdKMD>7#pEKPUNYc6ycMJe3y%!$BDe3$ZsS3
z62f~3r}g#{{WNa-i9C(N=PumCKjC1Uss8f`pF->@<{aZs<5NQ9v0sVxYdVp~HAlp=
zMv@ov`641u$Jd>byqKROF7hoz9@jL{e>w=K{&o>PRm9HMUE~iEekqavi0Gm5IZoth
zy&m|cjS1r)fJ4M5k8?TB6Nx<4GmUU+Po;~VIYgf7Sx7jw=T;XzVIoiUv=L7GPtrxt
z7Q%6k5pnnp(S!X;@ZS^pYQmo*^0fcIO5|}5BJ}))$cG4jpKxpgu`Zk@oa!&&-(|5K
zX&in`cnQ%znRB^)gG8R{xrJ~#&)n{!Cr0G`q~4zpPUo3U!fCymh<-ZHJV`k2K}0;a
z5j`}XFAz@S`3B)Mo*xkX^N9Xo!s-6}ymLVa62_nQlWQa{=B1k?F4ozVgrl8eKh`Ai
z(|o_3Ae`=hHWE(P_lF6m^U^N~r}qDrbF^hX93sv=lDzP1m&Ao%|4H=F^?e_ar~8NZ
zh&<gt93t|U5qpLRr~T&(qKEdM(?p)G@A>=#2l`9b_X(V1`(m8McZmSuwBB-}rwZgn
z+-4DZ^jEA4I^nb(?{MKQgi}39!fE?HNH~r2L!6_(G|vA><S!@o|1;s#-`@~DG|v4*
z9_tYA5pTKhLoR$s;^OzUiTpb*whPsN73auwV*eZ>e^#7{JRR4oBze*9_Y+RX%fp1<
zMCyHvaI{JMzV-`=PvY+vzvmofZzg)4cah&I@rhi|9|@=Syh%8<=Uu|7{6WGEV$U$)
zs7Kg;oO5Igi2NxcPxVhK0wGA)j-_yj@p3)k7-uoh+$?b+Ur#u-=K+a}-+!Ox9Ay`h
zdbdgP!msTT7wdAL#6|zyBXRNF>>Y^<`GXP{`oEI67)R%x2S!7Z`+phd=+`1RM0~0U
zr~b~D^ay`%C7h1;dcw<y{ut3u_n!&E7Zdq4L=V;9P54wIznSQv`X48p>VJ~xq5A)g
z@GFS^=ZGGvzmIUL|5c)g>VKE;X+-}4qKE1~OgPo=hq9Qkeen<p*K|yR<64DjJv)zZ
z@%IVON?iP1!GB3y{GGr|)p;QFi{Jg1NnHGnrj#dEH{&l!<q0$HTpL9$9&M^CH>2&Q
zQqF$8C|{XKDCO~1yg~8Ga`@?n-okG*{5Fy>;TilH6aGDvQVxF}6)lIq9lDbJC<9Wc
zIocR*h~uv>{~yT@O3+3Ac`d85O5}bZGR~EUBMT=&4#!+omN=PW+%!Y#`k`~hZ6ucE
zpC6QB2P?RzLGI=E;!-8mE4W-g_BGV$R=$+43!=PVWcalbuBa2&Mw&$ZHieKE_6s|z
zfQ?oDPu%_|r1GMixZ+%edD-2@^PPgCKA}e3i|aC8zCsA_Ya1^w>lO8iEA}Fhrz#%g
z<tf9wEW3s?I#yAxi<ig0X`@NlEm#sVWA&e3;-(GKR_CH%{}~U5C@=aCs+a4=BE=Wr
zSy8s|@0PgzEr&xckDqDez5_^kb`qWy<z7j-<c@;V*jVLt++0HHbS~MmT>gInc&pkz

diff --git a/macunpack/dir.c b/macunpack/dir.c
old mode 100755
new mode 100644
index 494b395..a1e3182
--- a/macunpack/dir.c
+++ b/macunpack/dir.c
@@ -1,12 +1,10 @@
+#include <stdlib.h>
 #include "globals.h"
 #include "../fileio/machdr.h"
 #include "../fileio/wrfile.h"
 #include "../util/util.h"
 #include "../util/masks.h"
 
-extern char *malloc();
-extern char *realloc();
-
 static char *dir_stack;
 static int dir_ptr = -64;
 static int dir_max;
diff --git a/macunpack/dir.o b/macunpack/dir.o
deleted file mode 100644
index 1a00d4ad4fa8c516443e45f534bbf4161e9687c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3952
zcmbuBU1(fI6vt<?wv91qV*IEYtJ{jTR(sjB_)TQfkYo$70aHb-xZUpFHB0u(yLW9;
z9}?IsG=`wQXhBd!T8c=iJ`_<fk)jcw>YKhu5rl+1)dwlIbUpvMbF#;qy&!m&J9FkY
zXU?2CbMNd-4~`7AghGlXq@Goc7E`67?F~Jq)tKr~?P_dhIyBQc`w5}=+_m{l=&CJs
z);h?E*IFpW<{krnMwgZSwZA%R*Qvc2qv9)i)C!9DoE}`&Wh`Fp15}-}S5RIU3srxg
zj;FMXc-X5J-fC$KXZsqQabxx+3d8dlI&zVttL!n6P1fi1EXKUD-6-x*buT85t^HJ8
z33+j?EjH$gr|v*^JnU5qUO4mGSHo)U3!$H@E*VFw<$Aqd{UH|j+nWTe{(YlfkI#2t
zhOcj@;#=%Td_jBHnOX$U+6EW@DKK8;?nZprvSpgrtb18+0;XC0UPq%>xY)+?u6_ub
z(jmpeUN!ey!`<ph>Q_s&(43uoGh28)k}2lWwiDU;V0mYoI#?)IGMQ{DYZu%|-p&`D
zsW#<V^ua=@;emmtBfEzWz3_1432VO<RY(LRbmDmxn(PYov~OvBmjb+(7#>JZ3l;ra
zyQ(cMpS5jm?Y~9S<^|Svle$uG)*Ej61t=A!Uo#1lr)CmXI*tG8+Cr_6@WUfJHRl#$
z^JJUht)|U2nqdWR8zroymDj&RR~zHmWw?Hmg{wyl-y;~SVYQjn^?IJPZjm>=7sR6U
zbgf%8l&1ptXaIjPfFBLub^vz*crk!a1@M^welmc+6Tm+R;2#C>GXeb50RDLZ|1yB9
zbk?y_C=(^u(RDsKsq3<vOid_jWFU&77sWoWV<KBpiQ$pa1N|e3(V?NS!NZBe{Rc({
z6Dps~<%%igI>|!0kj&dEmo2+0TgVg>#X@dMrHhGdAx+1CD!X((I4V<evIRGz>_VDi
zP>$_6$Q*aFuC46Jtcx*kRBUI8Y%4B>T1@08V5^1SH5>)duhSU>xzFoX;P{G}KNP_A
z`A>bY$G6D#L&hGgTkz)$XM6sB$9(*n7f$_%kMqe=5?sc4TyXei|24zWzKtG^6W=2Q
z@!;&_c~1e7fa9BIej1Pj{7!n9p93TTm-*CZz2UIudA}na!hV=9dsuTB&n3ZSJiiK#
zJa9aJ2rlEnEdhc&;LPNCuL6=F9+^)*_`zj9H{*|i1RVb#><9N52>4y}FyCf4eB3Sg
z1A^ZpxF!6^`1=Hx@eB(;J;KkS0Q*-2mvK%Aj;kEUUlRWDKg#@s;M)bC5q{*pzb))#
z{@)Y!GXJLpm+Spla9n{no-=~Wb)7fdpZ^QO9^XE{KNp4l{lfpx!d|{_zX*=~x@x}P
z6~SdZe+vH*;s1uPmwDKP7mCFH9(Eg!b?u;s^AI5&f^K7?+sZ0W<=x~ls$Ivc$60gi
zT+(vwNmp6vq?=UMv2s~iP7w{5_gZwAr;7PJ&S9%ibZv`nUVF`XuSeVCiHw8u`~OOW
z93U0`8$^s4gzpVr%d=%&_fvtK#Ly6O$vC`>P7+*IF%RE_ut$(x^nhazq`WHfExB>G
zjvgfqKK<j5n(=r?r11RAdP%|j`xuy-$3O1lu!V3PGkO$I$opn~{3l7_aa<pyPS&N}
zSu<WT=ziPR4D*}w_$Pf1{Of<2`kU?Fc^tMRyieFajOFpn5s!avLh7=CQL`~{hdZ@@
j{LRGtdq+rhnfK=#G=%uqe=GGh8~>w;e_V`(>L33PJin4<

diff --git a/macunpack/globals.c b/macunpack/globals.c
old mode 100755
new mode 100644
diff --git a/macunpack/globals.h b/macunpack/globals.h
old mode 100755
new mode 100644
diff --git a/macunpack/huffman.h b/macunpack/huffman.h
old mode 100755
new mode 100644
diff --git a/macunpack/jdw.c b/macunpack/jdw.c
old mode 100755
new mode 100644
diff --git a/macunpack/jdw.h b/macunpack/jdw.h
old mode 100755
new mode 100644
index 545c365..05badff
--- a/macunpack/jdw.h
+++ b/macunpack/jdw.h
@@ -19,5 +19,5 @@ typedef struct fileHdr {
 	unsigned long	mtime;
 	char		flength;
 	char		fname[32];	/* actually flength */
-};
+} fileHdr;
 
diff --git a/macunpack/lzc.c b/macunpack/lzc.c
old mode 100755
new mode 100644
index 08e26ff..5fa3c46
--- a/macunpack/lzc.c
+++ b/macunpack/lzc.c
@@ -1,5 +1,6 @@
 #include "macunpack.h"
 #ifdef LZC
+#include <string.h>
 #include "globals.h"
 #include "lzc.h"
 #include "../util/util.h"
diff --git a/macunpack/lzc.h b/macunpack/lzc.h
old mode 100755
new mode 100644
index daa6d86..c42eb2c
--- a/macunpack/lzc.h
+++ b/macunpack/lzc.h
@@ -25,5 +25,4 @@ typedef struct fileHdr {
 	unsigned long	fileauth;
 	unsigned long	flag1;
 	unsigned long	flag2;
-};
-
+} fileHdr;
diff --git a/macunpack/lzh.c b/macunpack/lzh.c
old mode 100755
new mode 100644
index 136f8d1..552cd19
--- a/macunpack/lzh.c
+++ b/macunpack/lzh.c
@@ -1,5 +1,6 @@
 #include "macunpack.h"
-#ifdef LZH
+#include <stdlib.h>
+#include <string.h>
 #include "globals.h"
 #include "lzh.h"
 #include "crc.h"
@@ -17,8 +18,6 @@
 #define LZSMASK		4095
 #define LZBUFFSIZE	8192	/* Max of above buffsizes */
 
-extern char *malloc();
-extern char *realloc();
 extern void de_lzah();
 extern unsigned char (*lzah_getbyte)();
 extern void de_lzh();
@@ -26,7 +25,7 @@ extern void de_lzh();
 typedef struct methodinfo {
 	char *name;
 	int number;
-};
+} methodinfo;
 
 static struct methodinfo methods[] = {
     {"-lh0-", lh0},
@@ -770,7 +769,3 @@ unsigned long obytes;
     de_lzh((long)(-1), (long)obytes, &lzh_current, 13);
     out_ptr = tmp_out_ptr;
 }
-#else /* LZH */
-int lzh; /* keep lint and some compilers happy */
-#endif /* LZH */
-
diff --git a/macunpack/lzh.h b/macunpack/lzh.h
old mode 100755
new mode 100644
index 5ebf8e5..93ad340
--- a/macunpack/lzh.h
+++ b/macunpack/lzh.h
@@ -45,7 +45,7 @@ typedef struct fileHdr { /* 58 bytes */
 	unsigned char	extendsize;
 	char		*extend;
 	char		*data;
-};
+} fileHdr;
 
 /* Currently known methods: */
 #define	lh0	0
@@ -57,11 +57,3 @@ typedef struct fileHdr { /* 58 bytes */
 #define lz4	6
 #define	lz5	7
 #define	lzs	8
-
-extern char *lzh_pointer;
-extern char *lzh_data;
-extern char *lzh_finfo;
-extern int lzh_fsize;
-extern int lzh_kind;
-extern char *lzh_file;
-
diff --git a/macunpack/macbinary.c b/macunpack/macbinary.c
old mode 100755
new mode 100644
index cab1e36..4142f31
--- a/macunpack/macbinary.c
+++ b/macunpack/macbinary.c
@@ -1,4 +1,5 @@
 #include "macunpack.h"
+#include <string.h>
 #include "globals.h"
 #include "../fileio/machdr.h"
 #include "../fileio/wrfile.h"
diff --git a/macunpack/macunpack.c b/macunpack/macunpack.c
old mode 100755
new mode 100644
index 767512f..19c648f
--- a/macunpack/macunpack.c
+++ b/macunpack/macunpack.c
@@ -1,4 +1,5 @@
 #include "macunpack.h"
+#include <unistd.h>
 #include "globals.h"
 #include "../util/patchlevel.h"
 #include "../fileio/wrfile.h"
diff --git a/macunpack/macunpack.h b/macunpack/macunpack.h
old mode 100755
new mode 100644
diff --git a/macunpack/macunpack.o b/macunpack/macunpack.o
deleted file mode 100644
index ef4770dcdae105eee83af98ceb473b239be58312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10808
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
Z4br_@hc#26Te0{Dsr}oeO5vo({|B#q9lihn

diff --git a/macunpack/makefile b/macunpack/makefile
old mode 100755
new mode 100644
index 69a19d3..fe07910
--- a/macunpack/makefile
+++ b/macunpack/makefile
@@ -77,10 +77,10 @@ lint:
 	lint $(CF) $(LFLAGS) $(SRCS) $(XSRCS) $(CRCS)
 
 clean:
-	-rm -f *.o
+	rm -f *.o
 
 clobber:clean
-	-rm -f macunpack
+	rm -f macunpack
 
 macunpack.o:	macunpack.h
 macunpack.o:	globals.h
diff --git a/macunpack/mcb.c b/macunpack/mcb.c
old mode 100755
new mode 100644
diff --git a/macunpack/pit.c b/macunpack/pit.c
old mode 100755
new mode 100644
index 9c5eae2..5f42fb8
--- a/macunpack/pit.c
+++ b/macunpack/pit.c
@@ -1,5 +1,6 @@
 #include "macunpack.h"
 #ifdef PIT
+#include <string.h>
 #include "../fileio/wrfile.h"
 #include "../fileio/fileglob.h"
 #include "../fileio/kind.h"
diff --git a/macunpack/pit.h b/macunpack/pit.h
old mode 100755
new mode 100644
diff --git a/macunpack/sit.c b/macunpack/sit.c
old mode 100755
new mode 100644
index 88d61cd..6fb46b4
--- a/macunpack/sit.c
+++ b/macunpack/sit.c
@@ -1,5 +1,6 @@
 #include "macunpack.h"
 #ifdef SIT
+#include <string.h>
 #include "globals.h"
 #include "sit.h"
 #include "crc.h"
@@ -22,7 +23,7 @@ extern unsigned char (*lzah_getbyte)();
 typedef struct methodinfo {
 	char *name;
 	int number;
-};
+} methodinfo;
 
 static struct methodinfo methods[] = {
     {"NoComp",  nocomp},
diff --git a/macunpack/sit.h b/macunpack/sit.h
old mode 100755
new mode 100644
index 383417b..ce51332
--- a/macunpack/sit.h
+++ b/macunpack/sit.h
@@ -32,7 +32,7 @@ typedef struct sitHdr {			/* 22 bytes */
 	OSType	signature2;		/* = 'rLau' -- for verification */
 	unsigned char	version;	/* version number */
 	char reserved[7];
-};
+} sitHdr;
 
 typedef struct fileHdr {		/* 112 bytes */
 	unsigned char	compRMethod;	/* rsrc fork compression method */
@@ -53,8 +53,7 @@ typedef struct fileHdr {		/* 112 bytes */
 	unsigned short dataCRC;		/* crc of data fork */
 	char reserved[6];
 	unsigned short hdrCRC;		/* crc of file header */
-};
-
+} fileHdr;
 
 /* file format is:
 	sitArchiveHdr
@@ -92,4 +91,3 @@ typedef struct fileHdr {		/* 112 bytes */
 /* all other numbers are reserved */
 
 #define	ESC	0x90	/* repeat packing escape */
-
diff --git a/macunpack/stf.c b/macunpack/stf.c
old mode 100755
new mode 100644
index 3c33fa1..b432e46
--- a/macunpack/stf.c
+++ b/macunpack/stf.c
@@ -1,5 +1,6 @@
 #include "macunpack.h"
 #ifdef STF
+#include <string.h>
 #include "stf.h"
 #include "globals.h"
 #include "huffman.h"
diff --git a/macunpack/stf.h b/macunpack/stf.h
old mode 100755
new mode 100644
index 5d5a9bd..8fe1adb
--- a/macunpack/stf.h
+++ b/macunpack/stf.h
@@ -11,5 +11,4 @@ typedef struct fileHdr {
 	char		fname[32];	/* actually flength */
 	unsigned long	rsrcLength;
 	unsigned long	dataLength;
-};
-
+} fileHdr;
diff --git a/macunpack/zma.c b/macunpack/zma.c
old mode 100755
new mode 100644
index 371d7eb..ba9d2f7
--- a/macunpack/zma.c
+++ b/macunpack/zma.c
@@ -1,5 +1,7 @@
 #include "macunpack.h"
 #ifdef ZMA
+#include <stdlib.h>
+#include <string.h>
 #include "globals.h"
 #include "zma.h"
 #include "crc.h"
@@ -9,8 +11,6 @@
 #include "../util/masks.h"
 #include "../util/util.h"
 
-extern char *malloc();
-extern char *realloc();
 extern void de_lzh();
 
 /* We do allow for possible backpointing, so we allocate the archive in core */
diff --git a/macunpack/zma.h b/macunpack/zma.h
old mode 100755
new mode 100644
index 04bfc9f..8626942
--- a/macunpack/zma.h
+++ b/macunpack/zma.h
@@ -42,7 +42,7 @@ typedef struct fileHdr {		/* 78 bytes */
 	unsigned char	fName[32];	/* a STR32 */
 	/* The following are overlayed in the original structure */
 	unsigned long	conts;		/* Pointer to directory contents */
-};
+} fileHdr;
 
 /* zma types (see what) */
 #define	z_noth	0	/* ??? */
diff --git a/macunpack/zma.o b/macunpack/zma.o
deleted file mode 100644
index 86d424d70966e3ec37ed3711a0f237fc85a41512..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14976
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
DFrXMM

diff --git a/macunpack/zmahdr.h b/macunpack/zmahdr.h
old mode 100755
new mode 100644
diff --git a/makefile b/makefile
index 6a94a0e..85208fa 100755
--- a/makefile
+++ b/makefile
@@ -1,5 +1,4 @@
-SHELL =	/bin/sh
-BINDIR =	/ufs/dik/tmpbin
+BINDIR =	bin
 # Use the following flags on the CF macro definition as needed.
 #
 # -DBSD if you are on a BSD system