Integrate local changes

3 files changed, 0 insertions, 2793 deletions

diff --git a/gnu/usr.bin/cvs/macintosh/maccvs.projects.sit.hqx b/gnu/usr.bin/cvs/macintosh/maccvs.projects.sit.hqx
deleted file mode 100644
index 5321000db86..00000000000
--- a/gnu/usr.bin/cvs/macintosh/maccvs.projects.sit.hqx
+++ /dev/null
@@ -1,270 +0,0 @@
-(This file must be converted with BinHex 4.0)
-:$d0A)&"bEfTPBh4c,R0TG!"6594%8dP8)3#3"$+q!*!%c(*6593K!!%!!$+qFNa
-KG3,r!*!$&[rr)#!,3eFJ8(*[DQ9MG(-!N"35l`#3!c%!$J&V!0B!N!-#!*!2KJ!
-!!3$rN!3"!+cdQ2ZY'C(1!*!&!D1m!*!'-MJ!N!VU-Jd0#NeKBd0@8bif1'X!N"8
-(i`#3%4B!!"SB!*!$&J!(!%f3!e"53eG*43%!Ukq,G+dCNLi!!#S9!!#S$J!!#)8
-!!"#GjiZP&3#3"Y)#$F"&C5Yci+Dj+DIAE5CKQr+9dddVc9mh)q`fB8P@IT'0ClG
-ZHYQ[am36DTaD4ikIYqD!hFTDmmPUY9PHrRUecq`B18iSf@66ifGZFT[G*VIC2X+
-2NLdPR2!Nciq5Ci344RK(RT&R8I+E--)lb@EENc$#)XF**icX*j56b9DJm0PeqG8
-40NPEphTN$fLEEA,F)rc)l5H$6BlMb3BQH1",-a02*)MSLeZ*lXCAqJ'+41&Jm"b
-#1MNrGS`LR1rE4p&JX06Pp6RDh,DPbajTNp$+j9*D(*j9$8!aR9cFr%m[aZ1jjrF
-QL(j56R4[G6#iEar`EHFFq(C`(Jc5Bj`[@8)l18I,A8%%jV'EFr4,FSkA+Fl4VjX
-cp0ZM9BQq`9AdqbERk2FijqMh,Fl4i3R1dHrE@VG5-Sf14k*Tb1iPXejRHZ6$-Y'
-P#[9&4ChLS1NjIQQjMfKQ%plG3bC"Q)XHjmi*$Ll9TP-1EH*%Up'ja1b+4Vbqk#6
-f)U!U&8HNC$DI#!C@k5G6"CMEl,BZAEE'kJa&(JR%,c6+G&!8aq81XjE(BZ'rmZ&
-kE-4hZD)iM3&`q+1q,Q-!(#l&fCM[8qi-G9KAGFDLm346j')2PmZj`L!!KmIa0@1
-!ZEDi@bi"[)8MVXCpaJ!ie-hKMJ)rP)E'2$r84*G"!)l@K[C@bCBEVFAPX6Uqj*J
-rrbU+0!k6c6Gr[L%!ML+ElrT!rS8MCKJ`epJNN!!E1#6Ej[raV#+,irTBk62!SAK
-9RcImi8$5Fiej9D-!(,l*bHERbS+0FCJCal80FJ1(C2Y!Yif&'6KD!YZ[pfKh0"I
-d8!8h+@aBb%SE9&SHc,93''YHZaUC+00ELK)8ZGMMYX+pLX-`3*NfVeKY,Fc$TAM
-bmc$q8,LiSehXF9[KAX(aNF+p`V,E#MH(ikE#,H#B8VL&Z8iTh"b1Q`Vh%Sj2&1l
-9JGa5Z(NF8`Vh%Sb2&@i1Kc'!`Z8`#&#QRP"Nb@,VYQ9,,b[6NSmf-)$N0YA8"Xl
-KZ,Nj#r1BfTaj($Ffc#8F(fqB()iL@di0&J-(L&q3!*iQ@cJd+H21+qi2'F)iSKe
-E*R%dGfc*ibKaA6RVCiIUFV",`3!JrVEaLM%0MBPr`B%0%jl8-*pP(''[UPSGdFj
-B+(aKZKP'BpF(f1cak9`re3`M'LqR&@rJb'r12-p'0PjLNQC68E+!(5l`dd`6m-4
-)G[[J8m9LX+q#+PHr3qXIHSISQ"DdrY'6I6fdq[iK5Uk-0kc8fmm@Jdr9X2&)Lar
-63CKA""AMa@LN(lp5l'p$Ye1LYjj-dmqpk[mbdId$H+MjD,jh@'+#F!MJ2dj9Vle
-)kcIF``rHCpX5m10G$q`qCj'R*8cYdF-MN`639reYY0iMDbMl+NpShpkhV@,`J%N
--2XeA1G-%pM4Jp0%Vi-"dZpd1$@$r$`GLBXdr1&"X!-#"INbDD[F-+0P*AZ$!c(V
-YfrYQE*`$BpKe$XbX(qF!cQ[rjF!rpi!4!!H)lX)Hf"@M+Q@"d3!(bX!"Zm1cmN(
-h+[XR('JAGaNRF%!cN!"Cr6eA1G#l-CEq[RDm`!(dd5X9*-fbTmrilUiB+e9l8m$
-V$m491qh@*PP4h8qdBjfF+MiYTfUIKDX1`@piMZE(derZ90d[UKqSS@9cIddd`,1
-G3lrEhL5UAcK-*RP[Z)lS`"I`LVpk92I,HlFm3E5QMYjpEdK1lMmT*hpiLZZLik(
-Ab9*j31YTUBc)b5LFIqZ1bmR)#8V*+6NT*ppL([1eQYQ5iC)N*pq%Mj(M)""ch$Q
-#0[R'LBC4A96G$fhYB!l-RZ!!$J"aEc`881e'+KbSQH!!UTP9B1$#!5Akp8"F#AX
-M#F-8$M549(pC$baIkejPc46IPj1rHTH4kbK+Kj!$diTLhKmj25UR(YiPjKhUiET
-`RYSSR&e0F[+C8RL-5GjMHSRS-(VK,U&p$r@3!-RCMClkGra9ad[m"Dp+bAbb(Kf
-H"TT'cM'&d8R)UB&D1I8m@*2'4R4(cI$`(6A8661)0#G'Yh"ZI8E-qm-L)"M#c)E
-I@T5Ga-+h$eNVj"5)8icHCHj3Cb`FX+i)"(*hIm15B&dVM&p)J+M5EQImd9hKZL@
-m(0Fd[1'2rZB)Hp4e*rie6dSZ[ST)Zpf+cV4ri"Vr0jjXm8(4)b4T"dqVprY%Mql
-N4d9RaKSZcRVXcCeHRfqVkX-&9ldmcD`p[P46(TPA3qHV4N'aBB1Dm-Ce1@I8%&A
-iUi'flRMVMEil5Y11'),-9e51rA(#1#CHCPCBq%,D#"p(Dd"0f(kQ1'biN!#0@QM
-1UaCG8FJiMijHlSd,5$ZUErkXES6Tlhm+-8+*qLNHQ%P#)qajkN&Q"-!G#5K`mc%
--#2ll#NhcfU*GNd)"QiI0,ZP%chNhP%Jl*QE$-IDIQI'rlSMlkKC8iA*1Fm4fNQ*
-a@*8q4c@a0RBcL8ChD`[ZGk,&0*!![EM4fQlk20)UVUdj3`Z4DMlaRH[S+dKEZ,C
-e$V'AA611H9iQ0p)qVRApPYU4iRU&im,$Y!(A+qj$Qhj$m0$2HBaVR@m3r%#eZ"-
-54AE6EY4`&b3+,U6[S2B#epcl'FqGflKQ5p'282XTeaE2SKG4'p4`2dQ[`&AaADi
-e2dNr4qeCVPRISb'L1XfYTIb5AXH*8X0DYjp1BiPSA[AD"qMh4(2ADV@B!)[QJLf
-BhfQ"[`I0e@i@,AeL0PLNmB"q`4I4ZmrESG!(5qDXpNj6%618H(4,`*H`JPYU+"U
-aC1UZN!$UQk'lB60@XNcGiie(3T&0DRQQ@F1f40bVQK[mS83dEQU-4K,Q9Qpm8b"
-K@Hlc"@"'8lb*cAL[Y5RMhaBiS[l!bN#NG13A"YSc(9"jfT5B`DfA-l$0MNBAQTA
-aMhNb1%CqdM1G5h##Dmpe2"EBAdI3D%l&E,Q-[DSC'#1q9HfCh[lr!!i!Yc*YeYR
-e$MU[Th9H4l2dbXc-kc`lZIETG5[A,h[6m056'Tj6hrKU9ekpChQC6Ic1RKb,h#D
-hcmK[ApY("Ta`-YKN5ik6hbFCm#2mb2',E(+EE-QafmG+mY`VYXeB*Q'%8q!'bGE
-Vm,'2RTGA+Xm"l6Gj6QDEc2J"N!!06!m2[!*eATCZAIFKK$$mRi$3Vek%rkp$cJA
-rXq$r-H4%dj%$P6MpLPXh%+VSH#%IiCTak"m&5a$U@MFLTq3`q[60)'$4F$J!$k'
-5B8E)A3crihLM`m-rk-AcDBh&m$q1jkLDGq`-hS34LqYVPaCADidK*D5TKQU82r6
-RLZHU0Rl!`m5$S289eY`C4I1SRZ,'pQ*5`fNm+"+9S"0G4fJ1RhL9rHLbCR3MbR+
--[f9F0pDrk&F&1K`kmJ8DLEDLVN03`#&#(Kl34rSIS9cJ@5lldF6#lLU+#AjqMH+
-ZA&9E0QYf5rH2)B,Npd9G0&!4r8R4Zr!02AU(I(I"phlbIB4rGePjrRZ#YlqSm#d
-)q'Eel%FII%,Lh@l13,hi"XH[mI[$pU!C+-raqE$2&bLK!"%+)-A258kJ$81iBKK
-*M&Q`(&KC-P-VRqfC8P`*R9a@"U`63*hDcXPiFifVZSTNJ'G1mUY#`N1#3r$LR5H
-S"hrh%8H&$"V'DXd$YUbS,3201!0*DchHB0Ck[!&Pm3kjUQ[$)5hJVBS%h%DCeaG
-4ZdYiqB@D,B"D8lf3!'5J2`j+A,FHD0+mCFepTD*pZ5[$Z+0ZdHSkNN(C$$92$iB
-e2@!NB6X2[IBq3b8CP-03Xd0Z[kI-RDJ8DR@qYChA#KR3%iTDB+LK9MA8S$Ae331
-@4k"k8"j9Gq482!1PSReM2rXE4i8-bQHS1BV(V`95Z"CU!820FcHVlTB8VS9Db&$
-c+DSH#5GJ,G6K*UT2-3bYUIele"%-0GIYdp4!XY*6U%8QUZlhDqG44c,83RG)9F*
-U!e#T&pP#(F@Cjfk&QHSmmbjLU0NHV5NK#eqKAXcj#P3J`p)3AbrK(9*$)6ed[N1
-M'HT`Y5fS"$`035AFr"@fK6U'Xla*mkP'T$&ClVkaarDBU-IfS,'FH8dD9"T3r)R
-@@V@1iaaU9ScHe[5KAXSje+`CB6f8P+%ikQ9F864[3!qTja4P[)RU$qUKXcTd8+!
-HK'QIpG@RZeX'qaT$[Cc2$6lGQjNEBUKAF'd!e-cF%%1pN[F982e'UP`,YCMheDm
--P"T(RFMjkYFp%G#80&pMU&Ia$[RE!jl'2KdrJhSeVc@J0``)Xi8kLD%@"*@3!+&
-UJ5Bp-HIeS%lQc!0KGDIPbd+pKLXP4I@TVDU[Gi3&V,m+e,qLDlNfK'#Z[U!0*9(
-8j(KpZYBTR%1!#Y2b1Ek@QULU1`)X'N+GbMN88S0kZV-@kR9FKd+kRY,N8kM6605
-`-L#`&QSCeb(Q!D4FLTkjSGa%$5[K5+Ua9Uh6HBI5FpFCe1Xjb`IE'NHG`6X8#AT
-J9KlSd)F#p80d3`pUQJda4CR*Y3%)C)"TNpD'@+hJ#!V8K[#!$X93Ch(8p5%P'!6
-#ISpk%rKX%2P+b1Y2bcPJ(4#S"p"XKTVA&"J!MD2Hc&'pDRL!HKEUR*1S2Le`$R8
-Z3md&9$$-"PJH3lhPC+f!H[e3VEFbe"a!ACpf[Lc8H3c9kIIFQ&'['1TmAQY)pDT
-YjfZYi#`hP&CeQVZr54EU!SCDB'MHCM"5I!RZ@CUhd%3&SbHBp&j1S9Bbe%++DS$
-4eJGVSGl'@Gif5$d,G4(R8,YU"")6laR8UJVULHBBBBqQTkE+cN96Ad38P@B@Fp6
-f9X@ARN8lelea18FPQ5A-`bi`fSebm,kJ5lh)Hprqr4''5M0,'DSc#&4)6lfGllc
-f@eiVbGc18,1TAjk#lIcCRLFj+XNXLhBSh"i%Gk1[3ep-[**hL'5U'HS)f2YS"Ld
-[9`+'GJEij8rIhF43DDD'S4DCU)PkAjVAqNH'5M2,'I1bkc4rDPiMI*dqhq3VC&B
-`e0cDX)IX$L4a1l@lrmj45FB9CB2EScBPfI$f(hjMmK8bGc"8i[@#6UCU(6AT,la
-@NPNCV9A6hH%q'`AYV94'meT*TMD+fZ31*&%lR42'mPT*TSkKjK08-Y%RHJ5+d#5
-dS3R9-`jGA+N(2"TC9P"mX&B4!TqM'ljcBXFE(*9N9R%fH,33mFZ6E!$QV"%F@S2
-Zj2TDPp)JaYI2rQRb&6+V1FXAY8+T+9LV3hIa@UZ)3jbZY3IeESCDX#!Bp+PeLUm
-P`E`He(XBkSM+ZSAeBFd(01SYf8*G`e$cABUl4I(f0mP#[CHK&VTFPA@`ZE93Eq[
-&Y9$A4V8KR0,B[@qrQ@Ib&6)0$,@3!#S+Z-4U(p1"fqm*PVq(eR'qNZN`N!$DQ1R
-8'Pif@3iCKGFD8--`0S6,`E[YVIAcjda9*TP'KTS$L*l8!)"HfR4G2Cmf5-E0eB[
-d0G*A*iPA[Rceh`b9CM`F04)!5cmeY1epGAX*la$*U&%1TC'"Eq-%mmDK*SBkdTb
-L9""RjA5RA[)IAFRl5M*HbqP*Y)K1b#GRj@DZP'ibUU@9F[94&qFVb@JQbf&938N
--+!4edG44BX)HKHlMYDERC)CDqNX6&6)Yh$N!$S99rcNrchGKFiZcJ@6m[+mq$9C
-kdY2'SY)$SN-(8)$V8#3YVS5[*qC`cD-CRD1QCcbU$9m8(cERFXJ%BrXSU9RCBX2
-p24Y13`jaU'HrBBKj4VI[eGmL#cAFi`)1e4TKU0RV&GM!1Xq'eZjGTB%1aGL`RU%
-kB3IV[jX+EA%rV`rD3Qf21SiADYeJqDrT#5#+qS#Bf$aJ,3pSHDR3mP,d)%20DaL
-%IH@YSMra+BTN(Z+e`RDH#VY+DAeY&[VDM$DbhFhKY8YAe+mqY94k%PAVfSdlf-C
-RefkdL8d!a)[5M3Dk+pCqaU(I0p*4`0N!'G6"8+NcPrCkVGh0c4`e"!0P'R9IlJ1
-ri,9#"Mem39'L%pX@dph8p%KDAi'PTMp%-P[&lSY29Fl[[Mc#*i#3!1VA@mpZB-4
-3YrAXS`bK2XTCAZRb43cb[fqh&lKG+PKHLVBce(aLKi!U''9kEkel2cBUF-H+KEF
-AN`akM+'1U3(6'e""8XbYjCjpjI[RE1De3JBpcQF8a3GEFmUj6B8RQ$ENJ`i4SJI
-G#DHR4e'HC+J&($8%HjqpU)F2&1%1mQZ538p9X(e+-2'@U)S(YP*k9kSlJjp-3Kd
-e0C9,D'B(Ua9fjNLY+4fkY!jfL!NUbD#Gd5e-*4a1$P,@&,@,ckmUq)f$%eX-p@N
-qXDdIF$C1S6l6M6U`24$EXpNGlqYh1m62a[TkINm8EDY!,NUqfI30"KBdBmmY)ME
-allZTeiI4(G4laULHjqrKhmh8ZF(SB6T&B,5+ZV)Bh8GG&Sa@FabGqJ`BhFAcASj
-h1pdQ`-K223q-UURMMe%6GCm`UU&H2ND0e'A$5+%H(8CVH"hhmZqPG*F")iek3KK
-9dHd,M&C3IakMGG34a-K&RAH-PY#0#BaUUFq0d8VUNQ2832e'M*L6MG&DkPTLY)c
-Z,f$NTViG4LVee$"D6VF'-,U6qXSBHDK$Ke'!ZM%B,DEl("MG6jQ*NC-k3KLemRb
-Bmb$)[hG3&F3Sa22C9,Fa+Z&jJhqAFI`@RVq"IdIB0rkbMrrf"#UL3rV&reEF"Zb
-p0Xjrqad)%6Nrm2mFldfqbd0iE[+EmlCIGc-HMSM0XV+jbhj*434rb8G#S,[b&pk
-[jrfA([!I,DH[A$RLr,Gp1K&2m1qRU)G'p@6B4e"$A%mb$Tk)*pNRU&)ZiDFM#f`
-jq-pMPb0VCd@-RrMi'p0YIJ*q"FGh%I`B2dPYCqHN6Cf($fk'1SrLBbC[!A-G[%e
-&P-q&Mlpqa1'FAq()HJTHjqSkJG#S'AaQ2I4D)q%Ym2*H`P[i*[P3jb((h%[qJY#
-8KcX2Ieb,5L#IYB1pXJ8[6N%Ya-Qi"IkAd(jP1h,amilpl1F&qr(cBcTLrF,2I9D
-4d"2RKLhGHX,bVI`l$0mEUCk`r)jp)jdMU*ii0fcYeK2RKNHSRMJh%0dYirQ@IEP
-hMDGkiYb`MHS*r6hT&c6UCZDP4ZI*c"Y,)[+N9r0%f`pcTD8$pUYC)[*PAh0PFJk
-`hcm685"0i[p1DB+rC1Q!rD+G#21&5'RA(*!!i[rJfi3LKNZrjX!4MT(!hMParYZ
-[6)SB)8hLr`DH6qT!1mrrT!GM(16Pi,QRp@$`r9!4l0PIQC%Hl1+rLrX$YMj)#qC
-%qi9B%@6+N!#5qBAf@lmL4NQMjN4T`4aJ[piXiL,Teaa`KD1BlMr&qCpj88$%Xl)
-bI`!pcAlI[eH5HDGGa-@bX$Nak5[E,qq,Z%6DS3-2d(HRC"4km#"pf8T#i4rC0a@
-)'*h4!ar[Trc+2dMX&pM[')RBEHR!3r6Y04R5rU'd`9HdVkF3-8Efj5[fljGNlZ!
-3-9C@aRrlSK%4jVdldM(qflHTL,K89XCrqmSB%CG*[rD+%[k`I5q1L2(5+rlrq#k
-4I3'3!!Li$da10JIDYab*Z&a@aRrl+LF49dM,I)$-I98LVT3Qm9rDX$pUAm`PJQb
-TbcPdB!ZpJd&Q-JpF`r2bJ2F+-lH3!)QB+![c"r[I+mYFYbEL+NX(j%IlSp+'[9(
-lEMN49m[+r%,l!Md4Nf4PIU&p5k#)bG)`[c$jVRhQcN-4edUAI!&j`6Y8Dp%kb[f
-[G#"c+J-0FY8""1J*ZHcJD232*NhmCErIN!#jm9(%&1RA[*Pi[mDqeP*%UI5)rmR
-hlk30Hk[f*9-LYXV+I%Ml*Ld4MmM+q'rIibTLUUb-rrCPY5+ZNjIa2h0-VKR6T&q
-qB1*GE2Zk2"(ET%Rl"r)"Ih$SAHaqIbKcel+)FQRCI2MYfkBNTNZrjX2NIYU3!$d
-!YfR,V[Krl[f#j(dYQH["4Fb3!'lY$rhS$pLARSZB+5[c"qbEh8AF+2hb"a*cSAd
-9USKRT'YcBHBUIa'cT&pci5Um'YKl0E[T0qSACDll&I(i%2p0hTYmP`IF9bU2Z+I
-8j#hRCC*AqA!P0$Y-2-1XQk3e['V#j*@0bA&HLA[2EF'Dr31[iR0+FMk4Mr"X,5E
-[R%`ka61iU[Xl)rRQrmf&mK3G5r1,ALeZmfZ1aDrN2PrmEKRj#Fmbr$)[DrpkVTd
-VRCQr62rK'rd#IPhr0F()KDYb'hjYa131f*)i[h+!AppG4(hVMh0ZmJlQRh`iqB6
-[CXePTNq@e$GkLrkhqh6cC$AqMAP(BY,(JIG-['VE0`bE,l[a&dcr&qr!Zi!PTDG
-m5%0T9DHjrc0+Q*F6bh2Q#01[0hPSlQfDFm8f["hB0#A1a`*$mcE$S9SqfrPC)+h
-JSlaLVb)jhbAmq3)$cSJ,IRdY'%),T6AqI)*AKC4A"KcpQL&@TE5'9`Nr+,GYb"#
-k,F1VT%mXEjRRKZD&R(E9#0K[J*0B*+haJkV3%RS[HTBe,bbZVeeD9UdePXfD[@b
-!9qEHSPQ(XkH1iE9,9p5[*N@3!',5G@`FV'2-JZ@e5iY,CQVPXce6LLY6"CPhVbI
-Ub+Y4h#YUbhaRHd(#e*PN2fTJ4)8'3"r-V[6eil%-2bTG[SK"rQGkmQLQ(klU@TM
-`!YkU5!"H3[Ek)QTI35E2%hANeqQk$aTTP1Q$r#!ZLJPmd`6`Z"a9F*c*E&H9cq#
-rJ4G2*`+VYe@iUSe`9$$)*14`eDVHVLla)lMUae&#IN1km(m0$3T0B@0$9P-Z8&"
-$!*!901%!N"''!!!b6J#3!aB!"J#r68e38N0A588"!+Z[LaLY'C)V!!!V'3!!TS!
-!!!IK!!!2jBcE3Ki!N!DS#3h!e@8Q@cIpc'BVffaPjc8JE0eXhA66c6CYhIMpK+f
-Gc*0jQmTdVmI1*h[#$Nrah@CD+eZIi,ZkPG#pNNf[h16S*TX0pNSfBEF*Zhf-E0T
-Y`MEGM1`RqbKKK*&pj2D4hib`c3MEM'c#b$2#0KRXBq3Bf8mf)i``mTYX`XLa)jZ
-4hib`&EKE*r9fK'dfXh@[arB6'Q'E(([#0VP0IKrCj$B!fF!%ViN&E1+"!b!!X,J
-2B"&qKD(qRek*VX*,kr%@c3d3@'@C"pDB9M@mlEH*kcU(*0[Dh@DRdpBZB!f(`qQ
-bG63h)S8'IS)AlYfi(Grjr[BC!--$!+DCS0dp,f'0IEdUDYN+PK%26,0JKEJD+ZJ
-j0P39M@fVLSkS`C!!lNPXII%(kYm"EF-!Y"k@S!rV6"hTKfQ(Yd+XrhGrLSi-`Bb
-4Z6$VAMh$3$mBqNpFL9S1B&06pc%%+-+6$Y5M69U#[8X'P8Fqp'09+M&ITrS%qDT
-k$lZq('!D!X0L8"0)*0*P%JP#JkEHR6c5f,H2(9Z3!+&%i`J'*$NicUj#+Kdj,Ja
-NcQ0"`5SmS#j(jEDjM5KFBkX[X0'Vh#Rd[-,dqP$)reFp2!ZUZRURXj82`1%*bVe
-m!!k(Xl8TAkHdeGGPE0i8#LS4+T(l04b1eJC1!%H(E58IS+mZYqX"i'X1*Dc)I!#
-1F,HrUk!2Cf06AKrK5#mRJ'00BqFD`CaVVGl4BE5pefBb2DC)FUM0XXR%"H"3QH9
-R$IN(4iJEd0I31-J,$X(Fr9qGP@FiRV89hS8F6LNX5riR$8Rf055&H3%FmRKRmhf
-PKSebD#M(d`RbJN-`hr9YYd+$(#i[Q[fRd@PV+rLKFPUN-'(49TV4TH9KRSD6XLD
-GDChPSa`@CrVD8D*%lYGiih!IFh!$R'PE3iZad!q(Xb2I$rk(`kfcE,aIiih$IF6
-abZ%q8YNEKj[MH1P`#a`6$VI3e`Q(Qq0ikA!IF2c6i6jZb'Z(QqHBF,J2-0ikh"`
-((m$KdZ!%10-1Aq$pYFDSTHkK-bej0B%4*$HT*LC`MZ2Pj#cdBf*bjMPH6*J(('m
-R6)j$CFkj35ebS2!,eP0Yp[['EGa0are%)C3Mf08ccY(@eC2R+(%mqUfIDDV$4VF
-81!$aYiQRa@i`*Ik&!bH-Ipc$6+BFILNF0YU#Qd)qrjhZTK@0Xpll'5j!ArrR'E)
-H,qF9Ah$N*fGHCpQ*&aQAf86SDZL'#ql6&"(FL4&%86+G)Y+5-c$PPhT`&HN"6V-
-!ec``1@(PSQr!J&eTY,2La6#65+CcXSHZif"m#`lLmJS"EH*@*#prEE'RR8M[186
-%DY!@*djkPJ&mD!3[XMfDhFF%+K!D"*RL-1h6+m'PBG2Y"PeE3RkmK`C1Z)cRQPm
-G)")B,jFl+3%,"$hTDBH2h9M2+$piVBCpa4qH)G)bV,Q88UM(f*2!@#H933d8Lk+
-)(N$NB@L!'-kI"q2[MGLrlr))0)#recJD'VKdQ8HJJ5QS!G(@B9rVEKCp!GRIkr'
-+[!S0'-VT,,ci'al",#`Ee3!DAr(e()J4E"4IB3jFL(-(jS!GK1PLFTA"h4ZLEPe
-FjC8mAL8XCUVC(AmNpYAAmA`ikkX1cSH+2LX2`*ra#))Um"e9@PcTrZf0d[kPHjM
--lrd#IZ08!c2(0)#c3*%8RcHY!Mk+"QD0D3#cYdB"Rd8$cZ!@Vq,d5i%)0d8$D$H
-U(rU"qYAZCZ-GFm!ak"MpNUX,2J`Vm*+1A$A'KGQGbkb$-+@Q&Qm)Q"f'LPpdirH
-6hBPV9X`2iEd6S&ZUTh8a(iIb%dHYJeqUaGaQkk!`Qj,Xq(D+jA2@`ChcDBjFrI9
-kc1r(lblNUd!i,@jH6h,l0SAmAQ1$ej[EIH#@"2@eK2mL!Sa+p[m`*BR4+-8rLQM
-Gk5GemcMGfLq5c-(Hb,pa9f!N0rl)31IGcIPrm@55DdQFP!LI(42kEFVDc$X$QNf
-5,'m1brJA1ra`Pc+M#"fq@C!![AAfCTBA&1[@K515mTr"`J1)5RcCJBdl1[9'ljf
-!STpc3IT,+QkpYm'2L4p49@L5Ek`m,S,[Uc3RAB[U8[),q$qNmaJ23E5MrQBYf8N
-q*F6SD0Uc(k$2M0I9IhmYKBF5e4-kd)#!KA$13aa22!$Y#%LKi`KdNEj!mpaKXcp
-aE*6M)AAqXr00HP4mC5IEjYX[$j(P"RmPrMN(!qN$)D6JZYB-Q"9UTaYGT-QpaP@
-&CjGkK+dq-GGFY3(Qi,'5jK`%PZ+4lFT2RJXI`D1,jXVUJHlcXq8jX3RS82d+c@Q
-h3bFH,p#FS3c@!8bKGD#P'[!GJ6R-TEI["Gb*QVZ$jZbVS"pcKfKZkKEi)ZCq3(-
-I(kBmaKM0Z@r!0c&hK1D#Tq%SjYK-A[%(q$(!I-EGGJ4qKVR[d9a2&jc&,QkQ19m
-#cZ(JB+`P0q!L`))@*UE*F!9J)H[Pqlj-8%8,f@*Vl5j5LVR2Xh&cR-a%&H'V5KL
-Rk%E%SVY[)DJZXhYX"Dl-U34l[(,%L0S+qi)"I6V[m)APXY4'F(UG,Th[N!#8J#q
-`)9bD,YBBM5K5@02Sm8@#LVST')KSeNM+"Qp%Abr,APc)FdU4EVc2bNbL6cIBJKk
-[h4[3CCpaB0G53+A*aF`dGbUGaYEBQKaBE"*pR#M0NAfSU*LQF"ZHA8rak(%&1%[
-$YM8ck8PdAcH0NGhGCGG5jIm2!*!$$J#h-UICjpE,cTl@Q6P)'h4ZhfZJVCaH([I
-Xj(63@@G(`e221MbR[R(m9ei0Y%EfpMESb$&b@h,l*IX)IieXXXQaMJ`ff8HfNAd
-qH5lC4ijI*pRN0RPfjA@5fek%GejQ%Ti(h#$CHTcL+cZpr%f9MfK2"M`b@Sk-@!"
-N!j2eJ2&!RCHP6pH$##%-[p-4qZ%hi(FKj"VJ0`pqhd2jD#(bS0NPpBT[E90&Jfj
-BHh%aU[Mp&"b',a(mAS!@`AmH([)&3V-,IGeQK@Ri%2jJVrMdI8mY$[qbp5#DJaI
-8fLRHffJ@V@maI,NBkMYr%'pkqFU@TVU+e9UlS4LDDUTQ[+L"S2@9eDq2SIP9Id9
-lE`@T!3SD$1Lhb"hX(d*,8"lqU(+JIbm$4!RHJ8Xm@`D+Z+%"Vc+rqaH%*Y)H&#m
-ZQdcUV@aSm&Bd@BUPk@(&k-A2HXl$cp(I,X$Ehi8TlrV`UZKqP"pPTCbeB5HT"Dq
-b5#dN0Z&9h4&HY`Dr[I6l8XL9HRV69+$3m0[Be1Jpp#@T$rT&kSGq,IS!YH$lm&@
-HQi#$aH1ZcGYFT4KKI"&&LY,F+QXRlGFiK*H2)pq9eB8Ye3JS2K@i0P4lrpSI,-I
-E6#[D6M,)`e!,ka@VFaL3!-EZlfcJU#5$aM(8m[VehXCSf0*#DZ9Km2kI+Mei@hh
-$kKU53AN-G6c3VaNd$a$05RfSeNFL8'ZVGfd0bD"mhU%Qbqr0GZJAMrbFG`JbU)"
-hU'S0D*5A-(ki3m'RTr-133B98ZDKI-A[Vr5PqEYRkMYra(h0eDh0*)1+''UKiJp
-Ti65ZJeV-8)YpRDU[+ihVS*B`e"++UNHY*+b$@QUM"KA6e!+pAk+@-G3LAe"6`kP
-+"e((fkKk++3G3beRU'8q3e8XY3fSG!6C3Ch!Q3H6Lq%laVb*$,A!V`8#'CSlU*-
-iAi%+C)!CiqY*[%1UBHM'X3j0CUMMeCk)%[Dh48#F$f-lU0rJ,!pS3G@-YUI+h62
-e[9dfkRZld-QFH3%0+JdVS@4VR9URF!je+ZD4eJbM6Z8FkY4-5cG5-T4!2B8VLYB
-4eJheU+*-Xe&$%CLBXkL[#Y4AdDQmVd(GecADecMUDAaZ#1SGZENKMMUGD`1JjZD
-'11VT[%-K*3ZD3$f$-bqNqk1J$KRQa9(2j"`+pBEplF1+2)4D`@X0kfeCLA93Cc$
-8dSKLQ+S@$ZM$Z!lU@Ca$)*'qM"!jU'Gc[KUq%5B-SFlNI398AmKrP%2Rf+LU,`U
-G(81GaCPRU#'pqcqD&dFpPl2"8#0kTV-1kQbZ+)DZTh9b%(@1M@ST@G&c81Ib[TT
-J[d66,A*3jr&D-e20%1TjR1@M$8UJcZFGLNEm-)PQ1r5D3(d09A+@GkZ'#EC5KZ9
-ae!8ae$BVUbKae)8FGE1K4#,U##%Fe%A%Z!0828*m,l1bFaLerifRAf+S*!1q%d@
-&D6iFd$T5S'K28D2&Di8-Z)A8I5RZ8+dXLD!["d5($S$,+&#$@[JSkK+'@J5Sd0S
-XAq1ShcaB+k!Z'U[e3SCD#+LE-`k4JhS43md2qCING#L1HM'[e9!le*jMY5jPU#@
-QdUh1piddDFqdVLU1#KQdM+'@QPT(*aJ1`56hS-*A4+f[S%XimhT'kH#JAXVlfUZ
-DiH5-0i4k'GGbF(T'41J3kZA,UAS9QTCIdp1irGAc[SqBjT(-FSlDfkd%-pAfEhV
-QG)j+-PAJde-1pCS,`1f"hKj"hVh[9fma9*TC`@U&HFJ2e[Y)XIhDeArLYC+-Pp9
-D&!f$NH)I3GfpGrYXAL[*A"(VN!$2V`D5[GfplpNIf4f#6(8-eHU0J(F`M2U['@G
-b9*+TBDMP)FAA#9Uq3!QEfK$`%hrrc9D'5M-V'HS%'c9Clq1AGIq@SG*-,H03362
-aSG2Ld&qpm(+EjC!!U@1ePT'qCRLdHppcTpKXJ-b9$,@%XL&G,f!9#p4LY%U`h0$
-#k5QUAfYl`QBjC&Ec'583$P&h)`P,PHkJjY9cpI)4mQ68UrAG"PiVbDaKIFf2J*!
-!Cr5erpG2ri5MNXaDZkpJc5R"G&qVjdd5qMS*0I!1C955SFjpc%D&c&9mfJ$Q@@S
-S2BN16!#0-Ei5cb'*frrSVJ#[P@5D@)FQHr@`Ak0V)N&B[M(!8rNB[Rp'hc-FP@5
-D14Z#'KMIkF%"ZRP!p28!DQ%G+SaQj)4ShJG,Z6E3c$U1'[#&V66a3*8VhV49'6,
-VBeUH3Hl2Rck9GiKN@[QdiGF-XJF`-QhXHhDMQ"XfSJeaKcJY+3jIVlEp)G8!8b6
-,mVMAHmh!TX)BkXB"Gh0-8DlpH#iIDDb$HYf!5c&@DaY$,GLX`#E&-3jYLVQEafG
-PjH00K@aIiaaU(h$,a[VULcNLac[NGrbKc$`83e86MXJ`V)-Di&X4e&F1UYhUX&3
-kU"em!S!Y'a9f$M)63+HB!$T4*p2A!VUEPTPI(pfe3m`S1j!!aP8CpQbJ5HPD*mh
-m!dFPQHYM%i#Qqe)6`'k[FM,AFT,TiK0EFhVqTl9Ulrc0RPmK%q4XU1i'8Fl-3`0
-69)MA@N1f@$+e$U#''@TT95359*Z9B&GbXKP!e4PUZEGj4BZP"@(81e+bJaTKU#8
-0LUp,k4KTNS0k!d-YipY[+r6KiF&"0@)ZK3Nl+HS`df(LHP(-ALmLNk1'93Z%dPS
-!Qb*(82rj,G[T)4Q,cj5!k%pE8HMaVHHem%Q8C+*FKjL2-J,lj)Glrm&3DDDES8k
-dR4i9"QhP%2VMSAFEHDdNXrQJ@kBB'4qPHYjFi6I-46d-YEKY&2E*&bDmc$Y%-Vh
-(R@q'5M0Ef,444TbHL!RVGX0,+FlFF12!e$Zf&A'6lGU5@P-lBS1ehXbh-*[UeVD
-dMLa'`QEN8qY`(pZ-I'SGZX@HE)+`'D@N2B!I2cq(+`V*E'8F+Q9pEG15Zd"lmPr
-`m`j""[8ae!)$YQbbfalj,f`AU0[40P4!Q8HR+'JTDHeKEIMhfaI`[N)'hFUC"cY
-B)61p*Z)`lcE(QIYbHq"fX3N89*9MQd"h-$C3Cbkc2H$XEGc*8)Q6UTYYG#1`GfL
-rC-p%6bQ[&6,SVZ-ZHmaah-ilC)$mCrFELQlm(Um9-ZKZfj[Ap'M'4`%&YldSNVQ
-(+`VdP66*)2[YKe(I2$!"pj'[53EGbe",1'V%PjcB"MLdBcRE`J6VVeC9r,#MFd4
-5qL0r$D'qqRT[,FhFap@,eCTQ`l6Vh`!G!P553II(GMF9bdSC-)llmJ"$,9$"T4c
-eKq+S1aPUiHDXUcb)qZ$(U0QpMIM@d82a$KhE%hdi`BB[pTA4lDqMHNm4I(JaI8f
-""Ffi1LML6[lr&MUrB"5Q8cK''R92-'VLHChrVkIZ18Ch85A%U*9kRaJe8-mDSb$
-(@8Ip9ia#2,qDih95,`FMjJ9M9%2h)$$UT[-Z4L[TKJ0'&Tfe-6,TT)j4K0Ga!rq
-rK[Va'+fP$MY'Pp00&Sa@d(d4M&E4M3+-VU!l(4K9dHd6M0C6KaHMkkR2Jj&"r31
--'UN2MY'9G(m"SfUkeB&4P%l['0A4E3L-DZNZ"8CGe2("b%Xh66"US5ie4X[TEJa
-'ee#'BV5B6XNB+6ar(HI""[lr2UU'''hNq898L6(Da22Am[pAFrbVH,kGrfpMrcd
-&`cVJ6P%LlT!!KHN!lXBp`1*c%cVJHJXLq[MrSr`rbRZElr)3RY[mjV`GdGqF4b"
-LZba-If'[M,aMj%RSJ1[%L,LArpp"[C84AA%G4K&ErdpAj$PkFKR[[a4K[KrhCmJ
-RG#$R#iUiKrhe)!pakbSmHFhl8He"RZ,hReRSb@YkUiZraB6IrpPE6hjB'+pJ2k$
-PHI)H)fpEX9VbQMF"AKQS@ar"FcfRVQprkNG8hBb`1kZZKp,GZ@V,lp!i9b02HKl
-PZETmb8XSrc1185GHEK$i3aJTPMda8F`$"pm3ScVJ[X8NJU$,`HD"FJpjPfeT3JI
-Fel9%&%ZAG1"qDB,rkqL"qfkDL"+CQ%m`V!1M,q'*+*@'kF!8cbR!iQ8*(A$I0K3
-"VSjN53Im2*r5!ar2Ikd,ChJUL+ee5"G'Akm8-9kDT!X2m1m5rS'V%p+#qG&pTe4
-%ZHc-Ah4IRK8a36Se2dS,jJ,h6@%4pL[LmUqjB*D([&0rkD!1j2EG46`N1r-2d%l
-frFKq5ZieF4'6T'2cBp+2GYq*&h'5p%-20Y1AQ@38ZY"$hhk582K-lL8!)LD2k8)
-[lk[mbPp)lLHi,q1)H$LT"ahdj8%CdRkMY-'(G'q!%!(ATNM#I-M8RNVZUJX4*m[
-1G-#pdd2%&0QC$VLAPiLB+M[6!IH@&K(%TCD$k8$59hD[Sa%a6CUP!qS*Rb"hpik
-)8f9Rmk&lbC!!L00NCcVJhUBN!LjANjcj",Rhm8AF+Ph5!@R$RUTlICD)dk8IHR!
-h[6T!CM)I"(KH([$HBZkq-"&R5-Ima06lDVR,d85FQG3$qG'HUV4K2p@p$8i%fAk
-@Q[Q,lV9h)QE)c[a&phir%@G*arc&T"kiPaQ+1&[Dj"[)&rb#h-f0)QC+`qE%j,X
-hlK@9)Xk4*ZP!kPdpDF2qURYENiMEC@HqSRXhUBKCXM-GF#pK&A'Zl%`(h0YQ4GK
-ACd[-G#"h$+iGFk4K1T!!I*rE[E42a)h5TId#qB#IH24plT52P,Y6@F4FkGRFq2P
-EUL6Q5F0d),@A0QBI`1hCXL`G1,T[NVS6*RFPZ)MjdUjpT"2qJAX2ZSK+fCPri&l
-i,Q+"0%`(N[1LHcfTL!HPEI0LlUCr%IE9JI)`Rj(H%acc'4ArPhHUfLFT5X0m4Kc
-!j2$'Fa*ki&kD,1)frYr9J46r8lcrIll,)qj5YIR-q6V#-lJYr3Y$pr`6ZT[JQlb
-%CpIK6F#5QBGj4QpiGhPfJD0RUEfla$dcmK1HjIKPhjRrb3Ljj+Yj3AkL@rCmpjP
-q!Em@I8+`EdT[q(8R*TIqcNR`Ua$ipF@PcKGq0BIppclMVrd1qB5riFaRYJq4dVR
-mN!"rb4Fqe%A5'CeclP6%B4`"GX`De$P$l9"l2Q2BaE)F[m(ffm6Ge`lI5NbP@jh
-[qh5d@(V#4j-2h(XYRq#ElBID[12q*ViIl`6@c%h`VY681MVKJ+fJkrJXNel-Fr)
-+hcSeekh$VF#QX`ra%Fk1Lhab64K#0mPUjVS8VmSSVd`i,MC(V#h5'PiPrD#LRM&
-$k*+aq5(P&mYEI+'aZD'`9cA$lP[G*#k9e[K"0DL@hLe1VJU2c`dV@jVU+PGVlC8
-0$GiXVlEarhBGq30eM'qU@p[55SSJa@6UZ(QdMX)QbqmGVB#&MCZXSk`ZE+P'32'
-TZ@,X1mj6rDL(8IAcIYMlP-NkbZ[AHaZMB8X,UD-%XA8[a60J@,1Z"k%'Xe,2p-2
-QHDSI9@ZDkLUmRa)fGP%j[R!k61@H'MLD`G03%c6j0q"hcDL&KdeIEeKY@M&#A%(
-q0$5T(4pp*$k#DedmXmNhT![r!b%K#d0A)&"bEfTPBh4c!*!C-3!1!@X!eJ#3!`%
-!!"SB!*!(&J#3!iB!!!%!rj!%!3#Xp*MlV4Q4cJ#3"3'M[!#3"M()!*!+0U&*&`!!:
diff --git a/gnu/usr.bin/cvs/macintosh/maccvs.rsrc.sit.hqx b/gnu/usr.bin/cvs/macintosh/maccvs.rsrc.sit.hqx
deleted file mode 100644
index 8b5b8dfe0c3..00000000000
--- a/gnu/usr.bin/cvs/macintosh/maccvs.rsrc.sit.hqx
+++ /dev/null
@@ -1,14 +0,0 @@
-(This file must be converted with BinHex 4.0)
-:$feKBf0fFbjbFh*M,R0TG!"6594%8dP8)3#3"!*E!*!%l,p6593K!!%!!!*EFNa
-KG3,r!*!$&[rr$3!,E@&MBhCc,R*cFQ-")mTJ!$9PbJ#3!i!!N!3"+qi1R+d!N"V
-rN!4bFh*M8P0&4!%!Um#*JDcYi3m!!!,1!*!'!G8!N!5ed!#3##))%3!)!$cFi3b
-Kcj0pmpAd3HjfE-CVb5I(RG%UGI`KVAa[[pEUH-IPG9`C'53PC9#Q6f5+&)m6f%5
-%$,B2PA@Nk%XlV2H"NJ-ZbeDiQhUf5Y@pIZ[3TQ9ddh2D[2h+eUK[rHbfjqBDIeM
-P2M@GeT%hfc'pbIGI'cp1-h-GrXf#C9)pII0(SA,,VQdM15pQElr#VbM6&0$i3h#
-qe))emidrbQReS3jp8Q0eaX*18,$6``8R*[I'I3+GNfp*lUkQeh4fAe8X0$4+-Hq
-28`3PNSCardJkc3`P*rK,Y0D1(['aH@C#PZ3C4%C55(Vk8*`CM6#FNL8bZ8KXY@Q
-S8$+A1#Xc`P*a5PSi)LTADG@UIDK!3SS6`AV)QC,)E)mBDKh!B8)c1$2bfX4jFNE
-R`3bhjLb6Te1YZl[56#S'dI!hBPjh+M)MR1(+BFiU5@H$9TC+UqMG-T+c-S*CrIY
-(8QKQjpE*S4a9p3X'3kec'YZ!$XNf0p(T60mhfb20ZJE,&XpIkGbd'!$)ZH%SJ`!
-&3dNp3kelY%q#PVALkpA54frpEXJ0l9rC10C4+23#6mJIk14SqF(f[A5A`VEGcQh
-[F+Ab1cq3!)KbdK[3$Hh'9-l@hSKZD$Xk9SG0!J"093!!:
diff --git a/gnu/usr.bin/cvs/macintosh/maccvs165.patch b/gnu/usr.bin/cvs/macintosh/maccvs165.patch
deleted file mode 100644
index 68f7733ca74..00000000000
--- a/gnu/usr.bin/cvs/macintosh/maccvs165.patch
+++ /dev/null
@@ -1,2509 +0,0 @@
-diff -r -C 2 -P base/cvs-1.6.5/ChangeLog cvs-1.6.5/ChangeLog
-*** base/cvs-1.6.5/ChangeLog	Tue Jan  9 06:20:05 1996
---- cvs-1.6.5/ChangeLog	Wed Jan 10 13:41:54 1996
-***************
-*** 1,2 ****
---- 1,12 ----
-+ Tue Jan  9 12:39:22 1995 Mike Ladwig <mike@twinpeaks.prc.com>
-+ 
-+ 	* Port of CVS (CVS 1.6.5 snapshot 1/9/96) to MacOS 7.x
-+ 	* Virtually all "cvs base" changes are to wrap filesystem calls
-+ 	  (e.g. CVS_FOPEN) to allow for pathname changes and permission
-+ 	  parameter removal
-+ 	* Mac-specific code (rcmd port, fs stuff) all in 'macintosh' subdir
-+ 	* Build requires CW GUSI 1.6.4 and CodeWarrier 7
-+ 	* 'release' doesn't work, due to cvs implementation approach
-+ 
-  Mon Jan  8 11:42:40 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
-  
-diff -r -C 2 -P base/cvs-1.6.5/lib/regex.c cvs-1.6.5/lib/regex.c
-*** base/cvs-1.6.5/lib/regex.c	Tue Oct 10 07:20:24 1995
---- cvs-1.6.5/lib/regex.c	Tue Jan  9 05:33:05 1996
-***************
-*** 231,236 ****
---- 231,240 ----
-  #define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
-  
-+ #ifndef MAX
-  #define MAX(a, b) ((a) > (b) ? (a) : (b))
-+ #endif
-+ #ifndef MIN
-  #define MIN(a, b) ((a) < (b) ? (a) : (b))
-+ #endif
-  
-  typedef char boolean;
-diff -r -C 2 -P base/cvs-1.6.5/lib/save-cwd.c cvs-1.6.5/lib/save-cwd.c
-*** base/cvs-1.6.5/lib/save-cwd.c	Sat Oct 28 07:20:10 1995
---- cvs-1.6.5/lib/save-cwd.c	Wed Jan 10 13:22:50 1996
-***************
-*** 122,126 ****
-  	}
-      }
-!   else if (chdir (cwd->name) < 0)
-      {
-        error (0, errno, "%s", cwd->name);
---- 122,126 ----
-  	}
-      }
-!   else if (CVS_CHDIR (cwd->name) < 0)
-      {
-        error (0, errno, "%s", cwd->name);
-diff -r -C 2 -P base/cvs-1.6.5/lib/system.h cvs-1.6.5/lib/system.h
-*** base/cvs-1.6.5/lib/system.h	Thu Jan  4 06:20:14 1996
---- cvs-1.6.5/lib/system.h	Tue Jan  9 05:33:06 1996
-***************
-*** 434,443 ****
-  #endif
-  
-! /* Under MS-DOS and its derivatives (like Windows NT), mkdir takes only one
-!    argument; permission is handled very differently on those systems than in
-!    in Unix.  So we leave such systems a hook on which they can hang their
-!    own definitions.  */
-  #ifndef CVS_MKDIR
-  #define CVS_MKDIR mkdir
-  #endif
-  
---- 434,483 ----
-  #endif
-  
-! /* Under non-UNIX operating systems (MS-DOS, WinNT, MacOS), many filesystem
-!    calls take  only one argument; permission is handled very differently on
-!    those systems than in Unix.  So we leave such systems a hook on which they
-!    can hang their own definitions.  */
-  #ifndef CVS_MKDIR
-  #define CVS_MKDIR mkdir
-+ #endif
-+ 
-+ #ifndef CVS_MKDIR
-+ #define CVS_MKDIR mkdir
-+ #endif
-+ 
-+ #ifndef CVS_OPEN
-+ #define CVS_OPEN open
-+ #endif
-+ 
-+ #ifndef CVS_CREAT
-+ #define CVS_CREAT creat
-+ #endif
-+ 
-+ #ifndef CVS_FOPEN
-+ #define CVS_FOPEN fopen
-+ #endif
-+ 
-+ #ifndef CVS_CHDIR
-+ #define CVS_CHDIR chdir
-+ #endif
-+ 
-+ #ifndef CVS_ACCESS
-+ #define CVS_ACCESS access
-+ #endif
-+ 
-+ #ifndef CVS_OPENDIR
-+ #define CVS_OPENDIR opendir
-+ #endif
-+ 
-+ #ifndef CVS_STAT
-+ #define CVS_STAT stat
-+ #endif
-+ 
-+ #ifndef CVS_RENAME
-+ #define CVS_RENAME rename
-+ #endif
-+ 
-+ #ifndef CVS_UNLINK
-+ #define CVS_UNLINK unlink
-  #endif
-  
-diff -r -C 2 -P base/cvs-1.6.5/src/add.c cvs-1.6.5/src/add.c
-*** base/cvs-1.6.5/src/add.c	Thu Jan  4 06:20:24 1996
---- cvs-1.6.5/src/add.c	Tue Jan  9 05:33:07 1996
-***************
-*** 381,385 ****
-      if (save_cwd (&cwd))
-  	return (1);
-!     if (chdir (dir) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", dir);
---- 381,385 ----
-      if (save_cwd (&cwd))
-  	return (1);
-!     if (CVS_CHDIR (dir) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", dir);
-diff -r -C 2 -P base/cvs-1.6.5/src/checkout.c cvs-1.6.5/src/checkout.c
-*** base/cvs-1.6.5/src/checkout.c	Thu Jan  4 06:20:25 1996
---- cvs-1.6.5/src/checkout.c	Tue Jan  9 05:33:07 1996
-***************
-*** 351,355 ****
-  
-  	(void) CVS_MKDIR (where, 0777);
-! 	if (chdir (where) < 0)
-  	    error (1, errno, "cannot chdir to %s", where);
-  	preload_update_dir = xstrdup (where);
---- 351,355 ----
-  
-  	(void) CVS_MKDIR (where, 0777);
-! 	if (CVS_CHDIR (where) < 0)
-  	    error (1, errno, "cannot chdir to %s", where);
-  	preload_update_dir = xstrdup (where);
-***************
-*** 402,406 ****
-  	*slash = '\0';
-  
-! 	if (chdir (where) < 0)
-  	    error (1, errno, "cannot chdir to %s", where);
-  
---- 402,406 ----
-  	*slash = '\0';
-  
-! 	if (CVS_CHDIR (where) < 0)
-  	    error (1, errno, "cannot chdir to %s", where);
-  
-***************
-*** 716,720 ****
-      if (pipeout)
-      {
-! 	if (chdir (repository) < 0)
-  	{
-  	    error (0, errno, "cannot chdir to %s", repository);
---- 716,720 ----
-      if (pipeout)
-      {
-! 	if (CVS_CHDIR (repository) < 0)
-  	{
-  	    error (0, errno, "cannot chdir to %s", repository);
-***************
-*** 855,859 ****
-  	*slash2 = '\0';
-  	(void) CVS_MKDIR (cp, 0777);
-! 	if (chdir (cp) < 0)
-  	{
-  	    error (0, errno, "cannot chdir to %s", cp);
---- 855,859 ----
-  	*slash2 = '\0';
-  	(void) CVS_MKDIR (cp, 0777);
-! 	if (CVS_CHDIR (cp) < 0)
-  	{
-  	    error (0, errno, "cannot chdir to %s", cp);
-***************
-*** 883,887 ****
-      }
-      (void) CVS_MKDIR (cp, 0777);
-!     if (chdir (cp) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", cp);
---- 883,887 ----
-      }
-      (void) CVS_MKDIR (cp, 0777);
-!     if (CVS_CHDIR (cp) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", cp);
-diff -r -C 2 -P base/cvs-1.6.5/src/client.c cvs-1.6.5/src/client.c
-*** base/cvs-1.6.5/src/client.c	Tue Jan  9 06:20:21 1996
---- cvs-1.6.5/src/client.c	Tue Jan  9 05:33:07 1996
-***************
-*** 375,382 ****
-  		error (1, 0, "premature end of file from server");
-  	}
-- 
-- 	if (c == '\n')
-- 	    break;
-  	
-  	result[input_index++] = c;
-  	while (input_index + 1 >= result_size)
---- 375,382 ----
-  		error (1, 0, "premature end of file from server");
-  	}
-  	
-+ 	if (c == '\012')
-+ 	    break;
-+ 
-  	result[input_index++] = c;
-  	while (input_index + 1 >= result_size)
-***************
-*** 691,697 ****
-  		       "could not get working directory: %s", toplevel_wd);
-  
-! 	if (chdir (toplevel_wd) < 0)
-  	    error (1, errno, "could not chdir to %s", toplevel_wd);
-! 	if (chdir (dirname) < 0)
-  	{
-  	    char *dir;
---- 691,697 ----
-  		       "could not get working directory: %s", toplevel_wd);
-  
-! 	if (CVS_CHDIR (toplevel_wd) < 0)
-  	    error (1, errno, "could not chdir to %s", toplevel_wd);
-! 	if (CVS_CHDIR (dirname) < 0)
-  	{
-  	    char *dir;
-***************
-*** 838,842 ****
-  	    free (dir);
-  	    /* Now it better work.  */
-! 	    if (chdir (dirname) < 0)
-  		error (1, errno, "could not chdir to %s", dirname);
-  	}
---- 838,842 ----
-  	    free (dir);
-  	    /* Now it better work.  */
-! 	    if (CVS_CHDIR (dirname) < 0)
-  		error (1, errno, "could not chdir to %s", dirname);
-  	}
-***************
-*** 1087,1091 ****
-            bin = 0;
-  
-!         fd = open (temp_filename,
-                     O_WRONLY | O_CREAT | O_TRUNC | (bin ? OPEN_BINARY : 0),
-                     0777);
---- 1087,1091 ----
-            bin = 0;
-  
-!         fd = CVS_OPEN (temp_filename,
-                     O_WRONLY | O_CREAT | O_TRUNC | (bin ? OPEN_BINARY : 0),
-                     0777);
-***************
-*** 1134,1138 ****
-  	        convert_file (temp_filename, O_RDONLY | OPEN_BINARY,
-  	    		      filename, O_WRONLY | O_CREAT | O_TRUNC);
-! 	        if (unlink (temp_filename) < 0)
-  	            error (0, errno, "warning: couldn't delete %s",
-                             temp_filename);
---- 1134,1138 ----
-  	        convert_file (temp_filename, O_RDONLY | OPEN_BINARY,
-  	    		      filename, O_WRONLY | O_CREAT | O_TRUNC);
-! 	        if (CVS_UNLINK (temp_filename) < 0)
-  	            error (0, errno, "warning: couldn't delete %s",
-                             temp_filename);
-***************
-*** 1156,1160 ****
-  	        error (1, 0, "patch original file %s does not exist",
-  		       short_pathname);
-! 	    if (stat (temp_filename, &s) < 0)
-  	        error (1, 1, "can't stat patch file %s", temp_filename);
-  	    if (s.st_size == 0)
---- 1156,1160 ----
-  	        error (1, 0, "patch original file %s does not exist",
-  		       short_pathname);
-! 	    if (CVS_STAT (temp_filename, &s) < 0)
-  	        error (1, 1, "can't stat patch file %s", temp_filename);
-  	    if (s.st_size == 0)
-***************
-*** 1227,1231 ****
-  	     * way they were transmitted.
-  	     */
-! 	    e = fopen (filename, "r");
-  	    if (e == NULL)
-  	        error (1, errno, "could not open %s", short_pathname);
---- 1227,1231 ----
-  	     * way they were transmitted.
-  	     */
-! 	    e = CVS_FOPEN (filename, "r");
-  	    if (e == NULL)
-  	        error (1, errno, "could not open %s", short_pathname);
-***************
-*** 1639,1643 ****
-      if (toplevel_wd[0] != '\0')
-        {
-! 	if (chdir (toplevel_wd) < 0)
-  	  error (1, errno, "could not chdir to %s", toplevel_wd);
-        }
---- 1639,1643 ----
-      if (toplevel_wd[0] != '\0')
-        {
-! 	if (CVS_CHDIR (toplevel_wd) < 0)
-  	  error (1, errno, "could not chdir to %s", toplevel_wd);
-        }
-***************
-*** 1685,1689 ****
-      struct dirent *dp;
-  
-!     if ((dirp = opendir (dir)) == NULL)
-      {
-  	if (! existence_error (errno))
---- 1685,1689 ----
-      struct dirent *dp;
-  
-!     if ((dirp = CVS_OPENDIR (dir)) == NULL)
-      {
-  	if (! existence_error (errno))
-***************
-*** 1742,1746 ****
-      if (toplevel_wd[0] != '\0')
-        {
-! 	if (chdir (toplevel_wd) < 0)
-  	  error (1, errno, "could not chdir to %s", toplevel_wd);
-        }
---- 1742,1746 ----
-      if (toplevel_wd[0] != '\0')
-        {
-! 	if (CVS_CHDIR (toplevel_wd) < 0)
-  	  error (1, errno, "could not chdir to %s", toplevel_wd);
-        }
-***************
-*** 1828,1832 ****
-  	    sprintf (adm_name, "%s/%s", dir, CVSADM_TAG);
-  
-! 	f = fopen (adm_name, "r");
-  	if (f == NULL)
-  	{
---- 1828,1832 ----
-  	    sprintf (adm_name, "%s/%s", dir, CVSADM_TAG);
-  
-! 	f = CVS_FOPEN (adm_name, "r");
-  	if (f == NULL)
-  	{
-***************
-*** 1860,1864 ****
-  	    sprintf (adm_name, "%s/%s", dir, CVSADM_CIPROG);
-  
-! 	f = fopen (adm_name, "r");
-  	if (f == NULL)
-  	{
---- 1860,1864 ----
-  	    sprintf (adm_name, "%s/%s", dir, CVSADM_CIPROG);
-  
-! 	f = CVS_FOPEN (adm_name, "r");
-  	if (f == NULL)
-  	{
-***************
-*** 1895,1899 ****
-  	    sprintf (adm_name, "%s/%s", dir, CVSADM_UPROG);
-  
-! 	f = fopen (adm_name, "r");
-  	if (f == NULL)
-  	{
---- 1895,1899 ----
-  	    sprintf (adm_name, "%s/%s", dir, CVSADM_UPROG);
-  
-! 	f = CVS_FOPEN (adm_name, "r");
-  	if (f == NULL)
-  	{
-***************
-*** 3181,3185 ****
-  
-      /* Don't think we can assume fstat exists.  */
-!     if (stat (file, &sb) < 0)
-  	error (1, errno, "reading %s", short_pathname);
-  
---- 3181,3185 ----
-  
-      /* Don't think we can assume fstat exists.  */
-!     if (CVS_STAT (file, &sb) < 0)
-  	error (1, errno, "reading %s", short_pathname);
-  
-***************
-*** 3202,3206 ****
-        bin = 0;
-  
-!     fd = open (file, O_RDONLY | (bin ? OPEN_BINARY : 0));
-  
-      if (fd < 0)
---- 3202,3206 ----
-        bin = 0;
-  
-!     fd = CVS_OPEN (file, O_RDONLY | (bin ? OPEN_BINARY : 0));
-  
-      if (fd < 0)
-***************
-*** 3256,3260 ****
-  	       the translation mode to created processes via environment
-  	       variables, ick.  */
-! 	    fd = open (tempfile, O_RDONLY | OPEN_BINARY);
-  	    if (fd < 0)
-  		error (1, errno, "reading %s", short_pathname);
---- 3256,3260 ----
-  	       the translation mode to created processes via environment
-  	       variables, ick.  */
-! 	    fd = CVS_OPEN (tempfile, O_RDONLY | OPEN_BINARY);
-  	    if (fd < 0)
-  		error (1, errno, "reading %s", short_pathname);
-***************
-*** 3297,3301 ****
-  	if (converting)
-  	{
-! 	    if (unlink (tempfile) < 0)
-  		error (0, errno,
-  		       "warning: can't remove temp file %s", tempfile);
---- 3297,3301 ----
-  	if (converting)
-  	{
-! 	    if (CVS_UNLINK (tempfile) < 0)
-  		error (0, errno,
-  		       "warning: can't remove temp file %s", tempfile);
-***************
-*** 3800,3804 ****
-  	    if (fclose (fp) < 0)
-  		error (0, errno, "cannot close %s", CVSADM_NOTIFY);
-! 	    if (unlink (CVSADM_NOTIFY) < 0)
-  		error (0, errno, "cannot remove %s", CVSADM_NOTIFY);
-  	    return;
---- 3800,3804 ----
-  	    if (fclose (fp) < 0)
-  		error (0, errno, "cannot close %s", CVSADM_NOTIFY);
-! 	    if (CVS_UNLINK (CVSADM_NOTIFY) < 0)
-  		error (0, errno, "cannot remove %s", CVSADM_NOTIFY);
-  	    return;
-***************
-*** 3845,3849 ****
-  	return;
-      }
-!     if (rename (CVSADM_NOTIFYTMP, CVSADM_NOTIFY) < 0)
-  	error (0, errno, "cannot rename %s to %s", CVSADM_NOTIFYTMP,
-  	       CVSADM_NOTIFY);
---- 3845,3849 ----
-  	return;
-      }
-!     if (CVS_RENAME (CVSADM_NOTIFYTMP, CVSADM_NOTIFY) < 0)
-  	error (0, errno, "cannot rename %s to %s", CVSADM_NOTIFYTMP,
-  	       CVSADM_NOTIFY);
-diff -r -C 2 -P base/cvs-1.6.5/src/commit.c cvs-1.6.5/src/commit.c
-*** base/cvs-1.6.5/src/commit.c	Fri Jan  5 06:20:20 1996
---- cvs-1.6.5/src/commit.c	Tue Jan  9 05:33:07 1996
-***************
-*** 297,301 ****
-  	    error (1, 0, "cannot specify both a message and a log file");
-  
-! 	if ((logfd = open (logfile, O_RDONLY | OPEN_BINARY)) < 0)
-  	    error (1, errno, "cannot open log file %s", logfile);
-  
---- 297,301 ----
-  	    error (1, 0, "cannot specify both a message and a log file");
-  
-! 	if ((logfd = CVS_OPEN (logfile, O_RDONLY | OPEN_BINARY)) < 0)
-  	    error (1, errno, "cannot open log file %s", logfile);
-  
-***************
-*** 1088,1092 ****
-  	FILE *fp;
-  
-! 	if ((fp = fopen (CVSADM_CIPROG, "r")) != NULL)
-  	{
-  	    char *line;
---- 1088,1092 ----
-  	FILE *fp;
-  
-! 	if ((fp = CVS_FOPEN (CVSADM_CIPROG, "r")) != NULL)
-  	{
-  	    char *line;
-***************
-*** 1414,1418 ****
-  #ifdef DEATH_SUPPORT
-  	if (strcmp (rcs, tmp) != 0
-! 	    && rename (rcs, tmp) == -1
-  	    && (isreadable (rcs) || !isreadable (tmp)))
-  	{
---- 1414,1418 ----
-  #ifdef DEATH_SUPPORT
-  	if (strcmp (rcs, tmp) != 0
-! 	    && CVS_RENAME (rcs, tmp) == -1
-  	    && (isreadable (rcs) || !isreadable (tmp)))
-  	{
-***************
-*** 1434,1438 ****
-  #else /* No DEATH_SUPPORT */
-  
-! 	if ((strcmp (rcs, tmp) == 0 || rename (rcs, tmp) != -1) ||
-  	    (!isreadable (rcs) && isreadable (tmp)))
-   	{
---- 1434,1438 ----
-  #else /* No DEATH_SUPPORT */
-  
-! 	if ((strcmp (rcs, tmp) == 0 || CVS_RENAME (rcs, tmp) != -1) ||
-  	    (!isreadable (rcs) && isreadable (tmp)))
-   	{
-***************
-*** 1589,1593 ****
-  	    
-  	    if (strcmp (oldfile, rcs) == 0
-! 		|| rename (oldfile, rcs) != 0
-  		|| isreadable (oldfile)
-  		|| !isreadable (rcs))
---- 1589,1593 ----
-  	    
-  	    if (strcmp (oldfile, rcs) == 0
-! 		|| CVS_RENAME (oldfile, rcs) != 0
-  		|| isreadable (oldfile)
-  		|| !isreadable (rcs))
-***************
-*** 1872,1876 ****
-      struct stat sb;
-  
-!     if (stat (user, &sb) != -1)
-  	(void) chmod (rcs, (int) sb.st_mode & ~0222);
-  }
---- 1872,1876 ----
-      struct stat sb;
-  
-!     if (CVS_STAT (user, &sb) != -1)
-  	(void) chmod (rcs, (int) sb.st_mode & ~0222);
-  }
-diff -r -C 2 -P base/cvs-1.6.5/src/create_adm.c cvs-1.6.5/src/create_adm.c
-*** base/cvs-1.6.5/src/create_adm.c	Fri Sep  8 07:20:21 1995
---- cvs-1.6.5/src/create_adm.c	Tue Jan  9 05:33:07 1996
-***************
-*** 66,70 ****
-      else
-  	(void) strcpy (tmp, CVSADM_REP);
-!     fout = fopen (tmp, "w+");
-      if (fout == NULL)
-      {
---- 66,70 ----
-      else
-  	(void) strcpy (tmp, CVSADM_REP);
-!     fout = CVS_FOPEN (tmp, "w+");
-      if (fout == NULL)
-      {
-***************
-*** 112,116 ****
-      else
-  	(void) strcpy (tmp, CVSADM_ENT);
-!     fout = fopen (tmp, "w+");
-      if (fout == NULL)
-      {
---- 112,116 ----
-      else
-  	(void) strcpy (tmp, CVSADM_ENT);
-!     fout = CVS_FOPEN (tmp, "w+");
-      if (fout == NULL)
-      {
-diff -r -C 2 -P base/cvs-1.6.5/src/cvs.h cvs-1.6.5/src/cvs.h
-*** base/cvs-1.6.5/src/cvs.h	Wed Jan  3 06:20:23 1996
---- cvs-1.6.5/src/cvs.h	Tue Jan  9 05:33:06 1996
-***************
-*** 231,236 ****
---- 231,241 ----
-  #endif
-  
-+ #ifndef FALSE
-  #define	FALSE		0
-+ #endif
-+ 
-+ #ifndef TRUE
-  #define	TRUE		1
-+ #endif
-  
-  /*
-diff -r -C 2 -P base/cvs-1.6.5/src/diff.c cvs-1.6.5/src/diff.c
-*** base/cvs-1.6.5/src/diff.c	Thu Jan  4 06:20:27 1996
---- cvs-1.6.5/src/diff.c	Tue Jan  9 05:33:07 1996
-***************
-*** 373,377 ****
-  	    if (run_exec (RUN_TTY, tmpnam (tmp), RUN_TTY, RUN_REALLY) == -1)
-  	    {
-! 		(void) unlink (tmp);
-  		error (1, errno, "fork failed during checkout of %s",
-  		       vers->srcfile->path);
---- 373,377 ----
-  	    if (run_exec (RUN_TTY, tmpnam (tmp), RUN_TTY, RUN_REALLY) == -1)
-  	    {
-! 		(void) CVS_UNLINK (tmp);
-  		error (1, errno, "fork failed during checkout of %s",
-  		       vers->srcfile->path);
-***************
-*** 423,427 ****
-  
-      if (empty_file == DIFF_REMOVED)
-! 	(void) unlink (tmp);
-  
-      (void) fflush (stdout);
---- 423,427 ----
-  
-      if (empty_file == DIFF_REMOVED)
-! 	(void) CVS_UNLINK (tmp);
-  
-      (void) fflush (stdout);
-***************
-*** 611,620 ****
-  	    if (xcmp (file, tmp) == 0)
-  	    {
-! 		(void) unlink (tmp);
-  		return (1);
-  	    }
-  	    break;
-  	case -1:			/* fork failed */
-! 	    (void) unlink (tmp);
-  	    error (1, errno, "fork failed during checkout of %s",
-  		   vers->srcfile->path);
---- 611,620 ----
-  	    if (xcmp (file, tmp) == 0)
-  	    {
-! 		(void) CVS_UNLINK (tmp);
-  		return (1);
-  	    }
-  	    break;
-  	case -1:			/* fork failed */
-! 	    (void) CVS_UNLINK (tmp);
-  	    error (1, errno, "fork failed during checkout of %s",
-  		   vers->srcfile->path);
-***************
-*** 622,626 ****
-  	    break;
-      }
-!     (void) unlink (tmp);
-      return (0);
-  }
---- 622,626 ----
-  	    break;
-      }
-!     (void) CVS_UNLINK (tmp);
-      return (0);
-  }
-diff -r -C 2 -P base/cvs-1.6.5/src/edit.c cvs-1.6.5/src/edit.c
-*** base/cvs-1.6.5/src/edit.c	Thu Jan  4 06:20:27 1996
---- cvs-1.6.5/src/edit.c	Tue Jan  9 05:33:07 1996
-***************
-*** 180,184 ****
-         is most sensible.  */
-  
-!     fp = fopen (CVSADM_NOTIFY, "r");
-      if (fp == NULL)
-      {
---- 180,184 ----
-         is most sensible.  */
-  
-!     fp = CVS_FOPEN (CVSADM_NOTIFY, "r");
-      if (fp == NULL)
-      {
-***************
-*** 225,229 ****
-  	error (0, errno, "cannot close %s", CVSADM_NOTIFY);
-  
-!     if (unlink (CVSADM_NOTIFY) < 0)
-  	error (0, errno, "cannot remove %s", CVSADM_NOTIFY);
-  
---- 225,229 ----
-  	error (0, errno, "cannot close %s", CVSADM_NOTIFY);
-  
-!     if (CVS_UNLINK (CVSADM_NOTIFY) < 0)
-  	error (0, errno, "cannot remove %s", CVSADM_NOTIFY);
-  
-***************
-*** 810,814 ****
-         is most sensible.  */
-  
-!     fp = fopen (CVSADM_NOTIFY, "r");
-      if (fp == NULL)
-      {
---- 810,814 ----
-         is most sensible.  */
-  
-!     fp = CVS_FOPEN (CVSADM_NOTIFY, "r");
-      if (fp == NULL)
-      {
-diff -r -C 2 -P base/cvs-1.6.5/src/entries.c cvs-1.6.5/src/entries.c
-*** base/cvs-1.6.5/src/entries.c	Thu Jan  4 06:20:28 1996
---- cvs-1.6.5/src/entries.c	Tue Jan  9 05:33:07 1996
-***************
-*** 280,284 ****
-  	{
-  	    struct stat sb;
-! 	    if (strlen (ts) > 30 && stat (user, &sb) == 0)
-  	    {
-  		char *c = ctime (&sb.st_mtime);
---- 280,284 ----
-  	{
-  	    struct stat sb;
-! 	    if (strlen (ts) > 30 && CVS_STAT (user, &sb) == 0)
-  	    {
-  		char *c = ctime (&sb.st_mtime);
-***************
-*** 373,377 ****
-      }
-  
-!     fpin = fopen (CVSADM_ENT, "r");
-      if (fpin == NULL)
-  	error (0, errno, "cannot open %s for reading", CVSADM_ENT);
---- 373,377 ----
-      }
-  
-!     fpin = CVS_FOPEN (CVSADM_ENT, "r");
-      if (fpin == NULL)
-  	error (0, errno, "cannot open %s for reading", CVSADM_ENT);
-***************
-*** 384,390 ****
-  
-  	fclose (fpin);
-      }
-  
-!     fpin = fopen (CVSADM_ENTLOG, "r");
-      if (fpin != NULL) 
-      {
---- 384,391 ----
-  
-  	fclose (fpin);
-+ 	fpin = NULL;
-      }
-  
-!     fpin = CVS_FOPEN (CVSADM_ENTLOG, "r");
-      if (fpin != NULL) 
-      {
-***************
-*** 395,398 ****
---- 396,400 ----
-  	do_rewrite = 1;
-  	fclose (fpin);
-+ 	fpin = NULL;
-      }
-  
-***************
-*** 528,532 ****
-      if (datep)
-  	*datep = (char *) NULL;
-!     fp = fopen (CVSADM_TAG, "r");
-      if (fp)
-      {
---- 530,534 ----
-      if (datep)
-  	*datep = (char *) NULL;
-!     fp = CVS_FOPEN (CVSADM_TAG, "r");
-      if (fp)
-      {
-diff -r -C 2 -P base/cvs-1.6.5/src/error.c cvs-1.6.5/src/error.c
-*** base/cvs-1.6.5/src/error.c	Sat Dec 16 06:20:29 1995
---- cvs-1.6.5/src/error.c	Tue Jan  9 05:33:07 1996
-***************
-*** 67,71 ****
---- 67,73 ----
-  #endif /* STDC_HEADERS */
-  
-+ #ifndef macintosh
-  extern char *strerror ();
-+ #endif
-  
-  typedef void (*fn_returning_void) PROTO((void));
-diff -r -C 2 -P base/cvs-1.6.5/src/fileattr.c cvs-1.6.5/src/fileattr.c
-*** base/cvs-1.6.5/src/fileattr.c	Fri Dec 22 06:20:27 1995
---- cvs-1.6.5/src/fileattr.c	Tue Jan  9 05:33:07 1996
-***************
-*** 79,83 ****
-  
-      attr_read_attempted = 1;
-!     fp = fopen (fname, "r");
-      if (fp == NULL)
-      {
---- 79,83 ----
-  
-      attr_read_attempted = 1;
-!     fp = CVS_FOPEN (fname, "r");
-      if (fp == NULL)
-      {
-***************
-*** 440,444 ****
-  
-      omask = umask (cvsumask);
-!     fp = fopen (fname, "w");
-      if (fp == NULL)
-      {
---- 440,444 ----
-  
-      omask = umask (cvsumask);
-!     fp = CVS_FOPEN (fname, "w");
-      if (fp == NULL)
-      {
-***************
-*** 465,469 ****
-  	    free (repname);
-  
-! 	    fp = fopen (fname, "w");
-  	}
-  	if (fp == NULL)
---- 465,469 ----
-  	    free (repname);
-  
-! 	    fp = CVS_FOPEN (fname, "w");
-  	}
-  	if (fp == NULL)
-diff -r -C 2 -P base/cvs-1.6.5/src/filesubr.c cvs-1.6.5/src/filesubr.c
-*** base/cvs-1.6.5/src/filesubr.c	Tue Jan  2 06:20:27 1996
---- cvs-1.6.5/src/filesubr.c	Tue Jan  9 05:48:57 1996
-***************
-*** 61,69 ****
-  	return;
-  
-!     if ((fdin = open (from, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open %s for copying", from);
-      if (fstat (fdin, &sb) < 0)
-  	error (1, errno, "cannot fstat %s", from);
-!     if ((fdout = creat (to, (int) sb.st_mode & 07777)) < 0)
-  	error (1, errno, "cannot create %s for copying", to);
-      if (sb.st_size > 0)
---- 61,69 ----
-  	return;
-  
-!     if ((fdin = CVS_OPEN (from, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open %s for copying", from);
-      if (fstat (fdin, &sb) < 0)
-  	error (1, errno, "cannot fstat %s", from);
-!     if ((fdout = CVS_CREAT (to, (int) sb.st_mode & 07777)) < 0)
-  	error (1, errno, "cannot create %s for copying", to);
-      if (sb.st_size > 0)
-***************
-*** 122,126 ****
-      struct stat sb;
-  
-!     if (stat (file, &sb) < 0)
-  	return (0);
-      return (S_ISDIR (sb.st_mode));
---- 122,126 ----
-      struct stat sb;
-  
-!     if (CVS_STAT (file, &sb) < 0)
-  	return (0);
-      return (S_ISDIR (sb.st_mode));
-***************
-*** 192,196 ****
-      int uid;
-      
-!     if (stat(file, &sb) == -1)
-  	return 0;
-      if (mode == F_OK)
---- 192,196 ----
-      int uid;
-      
-!     if (CVS_STAT(file, &sb) == -1)
-  	return 0;
-      if (mode == F_OK)
-***************
-*** 232,236 ****
-  	return (sb.st_mode & omask) == omask;
-  #else
-!     return access(file, mode) == 0;
-  #endif
-  }
---- 232,236 ----
-  	return (sb.st_mode & omask) == omask;
-  #else
-!     return CVS_ACCESS (file, mode) == 0;
-  #endif
-  }
-***************
-*** 246,250 ****
-      FILE *fp;
-  
-!     if ((fp = fopen (name, mode)) == NULL)
-  	error (1, errno, "cannot open %s", name);
-      return (fp);
---- 246,250 ----
-      FILE *fp;
-  
-!     if ((fp = CVS_FOPEN (name, mode)) == NULL)
-  	error (1, errno, "cannot open %s", name);
-      return (fp);
-***************
-*** 260,266 ****
-      struct stat sb;
-  
-!     if (stat (name, &sb) == 0 && (!S_ISDIR (sb.st_mode)))
-  	    error (0, 0, "%s already exists but is not a directory", name);
-!     if (!noexec && mkdir (name, 0777) < 0)
-  	error (1, errno, "cannot make directory %s", name);
-  }
---- 260,266 ----
-      struct stat sb;
-  
-!     if (CVS_STAT (name, &sb) == 0 && (!S_ISDIR (sb.st_mode)))
-  	    error (0, 0, "%s already exists but is not a directory", name);
-!     if (!noexec && CVS_MKDIR (name, 0777) < 0)
-  	error (1, errno, "cannot make directory %s", name);
-  }
-***************
-*** 279,283 ****
-  	return;
-  
-!     if (mkdir (name, 0777) == 0 || errno == EEXIST)
-  	return;
-      if (! existence_error (errno))
---- 279,283 ----
-  	return;
-  
-!     if (CVS_MKDIR (name, 0777) == 0 || errno == EEXIST)
-  	return;
-      if (! existence_error (errno))
-***************
-*** 293,297 ****
-      if (*cp == '\0')
-  	return;
-!     (void) mkdir (name, 0777);
-  }
-  
---- 293,297 ----
-      if (*cp == '\0')
-  	return;
-!     (void) CVS_MKDIR (name, 0777);
-  }
-  
-***************
-*** 308,312 ****
-      mode_t mode, oumask;
-  
-!     if (stat (fname, &sb) < 0)
-      {
-  	if (!noexec)
---- 308,312 ----
-      mode_t mode, oumask;
-  
-!     if (CVS_STAT (fname, &sb) < 0)
-      {
-  	if (!noexec)
-***************
-*** 360,364 ****
-  	return;
-  
-!     if (rename (from, to) < 0)
-  	error (1, errno, "cannot rename file %s to %s", from, to);
-  }
---- 360,364 ----
-  	return;
-  
-!     if (CVS_RENAME (from, to) < 0)
-  	error (1, errno, "cannot rename file %s to %s", from, to);
-  }
-***************
-*** 384,388 ****
---- 384,392 ----
-  	return (0);
-  
-+ #ifdef macintosh
-+     return (symlink (from, to));
-+ #else
-      return (link (from, to));
-+ #endif
-  }
-  
-***************
-*** 404,408 ****
-  	return (0);
-  
-!     return (unlink (f));
-  }
-  
---- 408,412 ----
-  	return (0);
-  
-!     return (CVS_UNLINK (f));
-  }
-  
-***************
-*** 426,430 ****
-  	return (0);
-  
-!     if (unlink (f) != 0)
-      {
-  	/* under NEXTSTEP errno is set to return EPERM if
---- 430,434 ----
-  	return (0);
-  
-!     if (CVS_UNLINK (f) != 0)
-      {
-  	/* under NEXTSTEP errno is set to return EPERM if
-***************
-*** 461,465 ****
-      if ( rmdir (path) != 0 && errno == ENOTEMPTY )
-      {
-! 	if ((dirp = opendir (path)) == NULL)
-  	    /* If unable to open the directory return
-  	     * an error
---- 465,469 ----
-      if ( rmdir (path) != 0 && errno == ENOTEMPTY )
-      {
-! 	if ((dirp = CVS_OPENDIR (path)) == NULL)
-  	    /* If unable to open the directory return
-  	     * an error
-***************
-*** 475,479 ****
-  	    sprintf (buf, "%s/%s", path, dp->d_name);
-  
-! 	    if (unlink (buf) != 0 )
-  	    {
-  		if (errno == EISDIR || errno == EPERM)
---- 479,483 ----
-  	    sprintf (buf, "%s/%s", path, dp->d_name);
-  
-! 	    if (CVS_UNLINK (buf) != 0 )
-  	    {
-  		if (errno == EISDIR || errno == EPERM)
-***************
-*** 550,556 ****
-      int ret;
-  
-!     if ((fd1 = open (file1, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open file %s for comparing", file1);
-!     if ((fd2 = open (file2, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open file %s for comparing", file2);
-      if (fstat (fd1, &sb1) < 0)
---- 554,560 ----
-      int ret;
-  
-!     if ((fd1 = CVS_OPEN (file1, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open file %s for comparing", file1);
-!     if ((fd2 = CVS_OPEN (file2, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open file %s for comparing", file2);
-      if (fstat (fd1, &sb1) < 0)
-diff -r -C 2 -P base/cvs-1.6.5/src/find_names.c cvs-1.6.5/src/find_names.c
-*** base/cvs-1.6.5/src/find_names.c	Sat Dec 16 06:20:30 1995
---- cvs-1.6.5/src/find_names.c	Tue Jan  9 05:33:07 1996
-***************
-*** 129,133 ****
-  	/* look only for CVS controlled sub-directories */
-  	if (find_dirs (".", dirlist, 1) != 0)
-! 	    error (1, errno, "cannot open current directory");
-      }
-  
---- 129,133 ----
-  	/* look only for CVS controlled sub-directories */
-  	if (find_dirs (".", dirlist, 1) != 0)
-! 	    error (1, errno, "cannot open current directory\n");
-      }
-  
-***************
-*** 171,175 ****
-  
-      /* set up to read the dir */
-!     if ((dirp = opendir (dir)) == NULL)
-  	return (1);
-  
---- 171,175 ----
-  
-      /* set up to read the dir */
-!     if ((dirp = CVS_OPENDIR (dir)) == NULL)
-  	return (1);
-  
-***************
-*** 211,217 ****
-  
-      /* set up to read the dir */
-!     if ((dirp = opendir (dir)) == NULL)
-  	return (1);
-- 
-      /* read the dir, grabbing sub-dirs */
-      while ((dp = readdir (dirp)) != NULL)
---- 211,216 ----
-  
-      /* set up to read the dir */
-!     if ((dirp = CVS_OPENDIR (dir)) == NULL)
-  	return (1);
-      /* read the dir, grabbing sub-dirs */
-      while ((dp = readdir (dirp)) != NULL)
-diff -r -C 2 -P base/cvs-1.6.5/src/history.c cvs-1.6.5/src/history.c
-*** base/cvs-1.6.5/src/history.c	Thu Jan  4 06:20:28 1996
---- cvs-1.6.5/src/history.c	Tue Jan  9 05:33:07 1996
-***************
-*** 702,706 ****
-      if (noexec)
-  	return;
-!     if ((fd = open (fname, O_WRONLY | O_APPEND | O_CREAT, 0666)) < 0)
-  	error (1, errno, "cannot open history file: %s", fname);
-  
---- 702,706 ----
-      if (noexec)
-  	return;
-!     if ((fd = CVS_OPEN (fname, O_WRONLY | O_APPEND | O_CREAT, 0666)) < 0)
-  	error (1, errno, "cannot open history file: %s", fname);
-  
-***************
-*** 729,737 ****
-  		if (!getwd (workdir))
-  		    error (1, errno, "can't getwd in history");
-! 		if (chdir (pw->pw_dir) < 0)
-  		    error (1, errno, "can't chdir(%s)", pw->pw_dir);
-  		if (!getwd (homedir))
-  		    error (1, errno, "can't getwd in %s", pw->pw_dir);
-! 		(void) chdir (workdir);
-  
-  		i = strlen (homedir);
---- 729,737 ----
-  		if (!getwd (workdir))
-  		    error (1, errno, "can't getwd in history");
-! 		if (CVS_CHDIR (pw->pw_dir) < 0)
-  		    error (1, errno, "can't chdir(%s)", pw->pw_dir);
-  		if (!getwd (homedir))
-  		    error (1, errno, "can't getwd in %s", pw->pw_dir);
-! 		(void) CVS_CHDIR (workdir);
-  
-  		i = strlen (homedir);
-***************
-*** 1001,1005 ****
-      struct stat st_buf;
-  
-!     if ((fd = open (fname, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open history file: %s", fname);
-  
---- 1001,1005 ----
-      struct stat st_buf;
-  
-!     if ((fd = CVS_OPEN (fname, O_RDONLY)) < 0)
-  	error (1, errno, "cannot open history file: %s", fname);
-  
-diff -r -C 2 -P base/cvs-1.6.5/src/ignore.c cvs-1.6.5/src/ignore.c
-*** base/cvs-1.6.5/src/ignore.c	Thu Jan  4 06:20:29 1996
---- cvs-1.6.5/src/ignore.c	Tue Jan  9 05:33:07 1996
-***************
-*** 132,136 ****
-  
-      /* load the file */
-!     fp = fopen (file, "r");
-      if (fp == NULL)
-      {
---- 132,136 ----
-  
-      /* load the file */
-!     fp = CVS_FOPEN (file, "r");
-      if (fp == NULL)
-      {
-***************
-*** 317,321 ****
-  	xdir = update_dir;
-  
-!     dirp = opendir (".");
-      if (dirp == NULL)
-  	return;
---- 317,321 ----
-  	xdir = update_dir;
-  
-!     dirp = CVS_OPENDIR (".");
-      if (dirp == NULL)
-  	return;
-diff -r -C 2 -P base/cvs-1.6.5/src/import.c cvs-1.6.5/src/import.c
-*** base/cvs-1.6.5/src/import.c	Thu Jan  4 06:20:29 1996
---- cvs-1.6.5/src/import.c	Tue Jan  9 05:33:08 1996
-***************
-*** 250,256 ****
-  
-      /* Create the logfile that will be logged upon completion */
-!     if ((logfp = fopen (tmpnam (tmpfile), "w+")) == NULL)
-  	error (1, errno, "cannot create temporary file `%s'", tmpfile);
-!     (void) unlink (tmpfile);		/* to be sure it goes away */
-      (void) fprintf (logfp, "\nVendor Tag:\t%s\n", argv[1]);
-      (void) fprintf (logfp, "Release Tags:\t");
---- 250,256 ----
-  
-      /* Create the logfile that will be logged upon completion */
-!     if ((logfp = CVS_FOPEN (tmpnam (tmpfile), "w+")) == NULL)
-  	error (1, errno, "cannot create temporary file `%s'", tmpfile);
-!     (void) CVS_UNLINK (tmpfile);		/* to be sure it goes away */
-      (void) fprintf (logfp, "\nVendor Tag:\t%s\n", argv[1]);
-      (void) fprintf (logfp, "Release Tags:\t");
-***************
-*** 302,306 ****
-      /* Make sure the temporary file goes away, even on systems that don't let
-         you delete a file that's in use.  */
-!     unlink (tmpfile);
-  
-      if (message)
---- 302,306 ----
-      /* Make sure the temporary file goes away, even on systems that don't let
-         you delete a file that's in use.  */
-!     CVS_UNLINK (tmpfile);
-  
-      if (message)
-***************
-*** 329,333 ****
-      wrap_add_file (CVSDOTWRAPPER, 1);
-  
-!     if ((dirp = opendir (".")) == NULL)
-      {
-  	err++;
---- 329,333 ----
-      wrap_add_file (CVSDOTWRAPPER, 1);
-  
-!     if ((dirp = CVS_OPENDIR (".")) == NULL)
-      {
-  	err++;
-***************
-*** 867,871 ****
-      tocvsPath = wrap_tocvs_process_file (user);
-      userfile = (tocvsPath == NULL ? user : tocvsPath);
-!     fpuser = fopen (userfile, "r");
-      if (fpuser == NULL) {
-  	/* not fatal, continue import */
---- 867,871 ----
-      tocvsPath = wrap_tocvs_process_file (user);
-      userfile = (tocvsPath == NULL ? user : tocvsPath);
-!     fpuser = CVS_FOPEN (userfile, "r");
-      if (fpuser == NULL) {
-  	/* not fatal, continue import */
-***************
-*** 874,878 ****
-  	goto read_error;
-      }
-!     fprcs = fopen (rcs, "w+");
-      if (fprcs == NULL) {
-  	ierrno = errno;
---- 874,878 ----
-  	goto read_error;
-      }
-!     fprcs = CVS_FOPEN (rcs, "w+");
-      if (fprcs == NULL) {
-  	ierrno = errno;
-***************
-*** 1036,1040 ****
-      if (ierrno == ENOSPC)
-      {
-! 	(void) unlink (rcs);
-  	fperror (logfp, 0, 0, "ERROR: out of space - aborting");
-  	error (1, 0, "ERROR: out of space - aborting");
---- 1036,1040 ----
-      if (ierrno == ENOSPC)
-      {
-! 	(void) CVS_UNLINK (rcs);
-  	fperror (logfp, 0, 0, "ERROR: out of space - aborting");
-  	error (1, 0, "ERROR: out of space - aborting");
-***************
-*** 1149,1153 ****
-  #endif
-  
-!     if (chdir (dir) < 0)
-      {
-  	ierrno = errno;
---- 1149,1153 ----
-  #endif
-  
-!     if (CVS_CHDIR (dir) < 0)
-      {
-  	ierrno = errno;
-diff -r -C 2 -P base/cvs-1.6.5/src/lock.c cvs-1.6.5/src/lock.c
-*** base/cvs-1.6.5/src/lock.c	Mon Dec 18 06:20:26 1995
---- cvs-1.6.5/src/lock.c	Tue Jan  9 05:33:08 1996
-***************
-*** 84,88 ****
-      {
-  	(void) sprintf (tmp, "%s/%s", repository, readlock);
-! 	if (unlink (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-      }
---- 84,88 ----
-      {
-  	(void) sprintf (tmp, "%s/%s", repository, readlock);
-! 	if (CVS_UNLINK (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-      }
-***************
-*** 91,95 ****
-      {
-  	(void) sprintf (tmp, "%s/%s", repository, writelock);
-! 	if (unlink (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-      }
---- 91,95 ----
-      {
-  	(void) sprintf (tmp, "%s/%s", repository, writelock);
-! 	if (CVS_UNLINK (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-      }
-***************
-*** 133,137 ****
-    /* Check if the uidlock is in the lock directory */
-    sprintf(uidlock, "%s/uidlock%d", lockdir, geteuid() );
-!   if( stat(uidlock, &sb) != -1)
-      return 1;   /* The file exists, therefore we own the lock */
-    else
---- 133,137 ----
-    /* Check if the uidlock is in the lock directory */
-    sprintf(uidlock, "%s/uidlock%d", lockdir, geteuid() );
-!   if( CVS_STAT (uidlock, &sb) != -1)
-      return 1;   /* The file exists, therefore we own the lock */
-    else
-***************
-*** 140,144 ****
-  		 */
-  #else
-!   if (stat (lockdir, &sb) != -1 && sb.st_uid == geteuid ())
-      return 1;
-    else
---- 140,144 ----
-  		 */
-  #else
-!   if (CVS_STAT (lockdir, &sb) != -1 && sb.st_uid == geteuid ())
-      return 1;
-    else
-***************
-*** 190,203 ****
-  #endif
-  	getpid());
-!     if ((fp = fopen (tmp, "w+")) == NULL || fclose (fp) == EOF)
-      {
-  	error (0, errno, "cannot create read lock in repository `%s'",
-  	       xrepository);
-  	readlock[0] = '\0';
-! 	if (unlink (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-  	return (1);
-      }
-!     if (unlink (tmp) < 0)
-  	error (0, errno, "failed to remove lock %s", tmp);
-  #endif
---- 190,203 ----
-  #endif
-  	getpid());
-!     if ((fp = CVS_FOPEN (tmp, "w+")) == NULL || fclose (fp) == EOF)
-      {
-  	error (0, errno, "cannot create read lock in repository `%s'",
-  	       xrepository);
-  	readlock[0] = '\0';
-! 	if (CVS_UNLINK (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-  	return (1);
-      }
-!     if (CVS_UNLINK (tmp) < 0)
-  	error (0, errno, "failed to remove lock %s", tmp);
-  #endif
-***************
-*** 214,218 ****
-      /* write a read-lock */
-      (void) sprintf (tmp, "%s/%s", xrepository, readlock);
-!     if ((fp = fopen (tmp, "w+")) == NULL || fclose (fp) == EOF)
-      {
-  	error (0, errno, "cannot create read lock in repository `%s'",
---- 214,218 ----
-      /* write a read-lock */
-      (void) sprintf (tmp, "%s/%s", xrepository, readlock);
-!     if ((fp = CVS_FOPEN (tmp, "w+")) == NULL || fclose (fp) == EOF)
-      {
-  	error (0, errno, "cannot create read lock in repository `%s'",
-***************
-*** 328,340 ****
-  #endif
-  	getpid ());
-!     if ((fp = fopen (tmp, "w+")) == NULL || fclose (fp) == EOF)
-      {
-  	error (0, errno, "cannot create write lock in repository `%s'",
-  	       repository);
-! 	if (unlink (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-  	return (L_ERROR);
-      }
-!     if (unlink (tmp) < 0)
-  	error (0, errno, "failed to remove lock %s", tmp);
-  #endif
---- 328,340 ----
-  #endif
-  	getpid ());
-!     if ((fp = CVS_FOPEN (tmp, "w+")) == NULL || fclose (fp) == EOF)
-      {
-  	error (0, errno, "cannot create write lock in repository `%s'",
-  	       repository);
-! 	if (CVS_UNLINK (tmp) < 0 && ! existence_error (errno))
-  	    error (0, errno, "failed to remove lock %s", tmp);
-  	return (L_ERROR);
-      }
-!     if (CVS_UNLINK (tmp) < 0)
-  	error (0, errno, "failed to remove lock %s", tmp);
-  #endif
-***************
-*** 359,367 ****
-  	/* write the write-lock file */
-  	(void) sprintf (tmp, "%s/%s", repository, writelock);
-! 	if ((fp = fopen (tmp, "w+")) == NULL || fclose (fp) == EOF)
-  	{
-  	    int xerrno = errno;
-  
-! 	    if (unlink (tmp) < 0 && ! existence_error (errno))
-  		error (0, errno, "failed to remove lock %s", tmp);
-  
---- 359,367 ----
-  	/* write the write-lock file */
-  	(void) sprintf (tmp, "%s/%s", repository, writelock);
-! 	if ((fp = CVS_FOPEN (tmp, "w+")) == NULL || fclose (fp) == EOF)
-  	{
-  	    int xerrno = errno;
-  
-! 	    if (CVS_UNLINK (tmp) < 0 && ! existence_error (errno))
-  		error (0, errno, "failed to remove lock %s", tmp);
-  
-***************
-*** 402,406 ****
-  #endif
-  
-!     if ((dirp = opendir (repository)) == NULL)
-  	error (1, 0, "cannot open directory %s", repository);
-  
---- 402,406 ----
-  #endif
-  
-!     if ((dirp = CVS_OPENDIR (repository)) == NULL)
-  	error (1, 0, "cannot open directory %s", repository);
-  
-***************
-*** 417,421 ****
-  	    line = xmalloc (strlen (repository) + strlen (dp->d_name) + 5);
-  	    (void) sprintf (line, "%s/%s", repository, dp->d_name);
-! 	    if (stat (line, &sb) != -1)
-  	    {
-  #ifdef CVS_FUDGELOCKS
---- 417,421 ----
-  	    line = xmalloc (strlen (repository) + strlen (dp->d_name) + 5);
-  	    (void) sprintf (line, "%s/%s", repository, dp->d_name);
-! 	    if (CVS_STAT (line, &sb) != -1)
-  	    {
-  #ifdef CVS_FUDGELOCKS
-***************
-*** 425,429 ****
-  		 * successful, re-open the directory and try again.
-  		 */
-! 		if (now >= (sb.st_ctime + CVSLCKAGE) && unlink (line) != -1)
-  		{
-  		    (void) closedir (dirp);
---- 425,429 ----
-  		 * successful, re-open the directory and try again.
-  		 */
-! 		if (now >= (sb.st_ctime + CVSLCKAGE) && CVS_UNLINK (line) != -1)
-  		{
-  		    (void) closedir (dirp);
-***************
-*** 503,507 ****
-  
-  	    sprintf(uidlock, "%s/uidlock%d", masterlock, geteuid() );
-! 	    if ((fp = fopen(uidlock, "w+")) == NULL)
-  	    {
-  		/* We failed to create the uidlock,
---- 503,507 ----
-  
-  	    sprintf(uidlock, "%s/uidlock%d", masterlock, geteuid() );
-! 	    if ((fp = CVS_FOPEN (uidlock, "w+")) == NULL)
-  	    {
-  		/* We failed to create the uidlock,
-***************
-*** 539,543 ****
-  	 * someone probably just removed it (thus releasing the lock)
-  	 */
-! 	if (stat (masterlock, &sb) < 0)
-  	{
-  	    if (existence_error (errno))
---- 539,543 ----
-  	 * someone probably just removed it (thus releasing the lock)
-  	 */
-! 	if (CVS_STAT (masterlock, &sb) < 0)
-  	{
-  	    if (existence_error (errno))
-diff -r -C 2 -P base/cvs-1.6.5/src/login.c cvs-1.6.5/src/login.c
-*** base/cvs-1.6.5/src/login.c	Sun Dec 24 06:20:24 1995
---- cvs-1.6.5/src/login.c	Tue Jan  9 05:33:08 1996
-***************
-*** 192,196 ****
-       inefficient, but we're not talking about a gig of data here. */
-  
-!   fp = fopen (passfile, "r");
-    if (fp != NULL)
-      {
---- 192,196 ----
-       inefficient, but we're not talking about a gig of data here. */
-  
-!   fp = CVS_FOPEN (passfile, "r");
-    if (fp != NULL)
-      {
-***************
-*** 232,236 ****
-  
-            tmp_name = tmpnam (NULL);
-!           if ((tmp_fp = fopen (tmp_name, "w")) == NULL)
-              {
-                error (1, errno, "unable to open temp file %s", tmp_name);
---- 232,236 ----
-  
-            tmp_name = tmpnam (NULL);
-!           if ((tmp_fp = CVS_FOPEN (tmp_name, "w")) == NULL)
-              {
-                error (1, errno, "unable to open temp file %s", tmp_name);
-***************
-*** 239,243 ****
-            chmod (tmp_name, 0600);
-  
-!           fp = fopen (passfile, "r");
-            if (fp == NULL)
-              {
---- 239,243 ----
-            chmod (tmp_name, 0600);
-  
-!           fp = CVS_FOPEN (passfile, "r");
-            if (fp == NULL)
-              {
-***************
-*** 268,272 ****
-    else
-      {
-!       if ((fp = fopen (passfile, "a")) == NULL)
-          {
-            error (1, errno, "could not open %s", passfile);
---- 268,272 ----
-    else
-      {
-!       if ((fp = CVS_FOPEN (passfile, "a")) == NULL)
-          {
-            error (1, errno, "could not open %s", passfile);
-***************
-*** 327,331 ****
-    /* Else get it from the file. */
-    passfile = construct_cvspass_filename ();
-!   fp = fopen (passfile, "r");
-    if (fp == NULL)
-      {
---- 327,331 ----
-    /* Else get it from the file. */
-    passfile = construct_cvspass_filename ();
-!   fp = CVS_FOPEN (passfile, "r");
-    if (fp == NULL)
-      {
-diff -r -C 2 -P base/cvs-1.6.5/src/logmsg.c cvs-1.6.5/src/logmsg.c
-*** base/cvs-1.6.5/src/logmsg.c	Mon Dec 25 06:20:18 1995
---- cvs-1.6.5/src/logmsg.c	Tue Jan  9 05:33:08 1996
-***************
-*** 145,149 ****
-      (void) tmpnam (fname);
-    again:
-!     if ((fp = fopen (fname, "w+")) == NULL)
-  	error (1, 0, "cannot create temporary file %s", fname);
-  
---- 145,149 ----
-      (void) tmpnam (fname);
-    again:
-!     if ((fp = CVS_FOPEN (fname, "w+")) == NULL)
-  	error (1, 0, "cannot create temporary file %s", fname);
-  
-***************
-*** 180,184 ****
-      if (fclose (fp) == EOF)
-          error (1, errno, "%s", fname);
-!     if (stat (fname, &pre_stbuf) == -1)
-  	pre_stbuf.st_mtime = 0;
-  
---- 180,184 ----
-      if (fclose (fp) == EOF)
-          error (1, errno, "%s", fname);
-!     if (CVS_STAT (fname, &pre_stbuf) == -1)
-  	pre_stbuf.st_mtime = 0;
-  
-***************
-*** 205,209 ****
-  	free (*messagep);
-  
-!     if (stat (fname, &post_stbuf) != 0)
-  	    error (1, errno, "cannot find size of temp file %s", fname);
-  
---- 205,209 ----
-  	free (*messagep);
-  
-!     if (CVS_STAT (fname, &post_stbuf) != 0)
-  	    error (1, errno, "cannot find size of temp file %s", fname);
-  
-***************
-*** 293,297 ****
-      last_template = xstrdup (template);
-  
-!     if ((tfp = fopen (template, "r")) != NULL)
-      {
-  	char *line = NULL;
---- 293,297 ----
-      last_template = xstrdup (template);
-  
-!     if ((tfp = CVS_FOPEN (template, "r")) != NULL)
-      {
-  	char *line = NULL;
-diff -r -C 2 -P base/cvs-1.6.5/src/main.c cvs-1.6.5/src/main.c
-*** base/cvs-1.6.5/src/main.c	Sat Dec 16 06:20:32 1995
---- cvs-1.6.5/src/main.c	Tue Jan  9 05:33:08 1996
-***************
-*** 37,40 ****
---- 37,44 ----
-  #include "patchlevel.h"
-  
-+ #ifdef macintosh
-+ #include <sioux.h>
-+ #endif
-+ 
-  #if HAVE_KERBEROS
-  #include <sys/socket.h>
-***************
-*** 269,272 ****
---- 273,285 ----
-          don't use it. */
-      int option_index = 0;
-+ 
-+ #ifdef macintosh
-+ 	GUSIDefaultSetup();
-+ 	argc = ccommand(&argv);
-+ 
-+ 	SIOUXSettings.showstatusline = TRUE;
-+ 	SIOUXSettings.asktosaveonclose = FALSE;
-+ 
-+ #endif
-  
-      error_set_cleanup (error_cleanup);
-diff -r -C 2 -P base/cvs-1.6.5/src/modules.c cvs-1.6.5/src/modules.c
-*** base/cvs-1.6.5/src/modules.c	Thu Jan  4 06:20:30 1996
---- cvs-1.6.5/src/modules.c	Tue Jan  9 05:33:08 1996
-***************
-*** 338,342 ****
-  		     instead of just at the bottom */
-  	    make_directories (dir);
-! 	    if (chdir (dir) < 0)
-  	    {
-  		error (0, errno, "cannot chdir to %s", dir);
---- 338,342 ----
-  		     instead of just at the bottom */
-  	    make_directories (dir);
-! 	    if (CVS_CHDIR (dir) < 0)
-  	    {
-  		error (0, errno, "cannot chdir to %s", dir);
-***************
-*** 643,647 ****
-  static int s_count = 0;			/* Number of elements used */
-  
-! static int Status;		        /* Nonzero if the user is
-  					   interested in status
-  					   information as well as
---- 643,647 ----
-  static int s_count = 0;			/* Number of elements used */
-  
-! static int capsstatus;		        /* Nonzero if the user is
-  					   interested in status
-  					   information as well as
-***************
-*** 663,667 ****
-      const struct sortrec *right = (const struct sortrec *) r;
-  
-!     if (Status)
-      {
-  	/* If Sort by status field, compare them. */
---- 663,667 ----
-      const struct sortrec *right = (const struct sortrec *) r;
-  
-!     if (capsstatus)
-      {
-  	/* If Sort by status field, compare them. */
-***************
-*** 682,686 ****
-      struct sortrec *s_rec;
-  
-!     if (Status && *d == '-' && *(d + 1) == 'a')
-  	return;				/* We want "cvs co -s" and it is an alias! */
-  
---- 682,686 ----
-      struct sortrec *s_rec;
-  
-!     if (capsstatus && *d == '-' && *(d + 1) == 'a')
-  	return;				/* We want "cvs co -s" and it is an alias! */
-  
-***************
-*** 716,720 ****
-  
-      /* Look for the "-s statusvalue" text */
-!     if (Status)
-      {
-  	s_rec->status = def_status;
---- 716,720 ----
-  
-      /* Look for the "-s statusvalue" text */
-!     if (capsstatus)
-      {
-  	s_rec->status = def_status;
-***************
-*** 779,788 ****
-      struct winsize ws;
-  
-!     (void) ioctl (0, TIOCGWINSZ, &ws);
-      cols = ws.ws_col;
-  #endif
-  #endif
-  
-!     Status = status;
-  
-      /* Read the whole modules file into allocated records */
---- 779,792 ----
-      struct winsize ws;
-  
-! #ifdef __MWERKS__
-! 	(void) ioctl (0, TIOCGWINSZ, (long *) &ws);
-! #else
-! 	(void) ioctl (0, TIOCGWINSZ, &ws);
-! #endif
-      cols = ws.ws_col;
-  #endif
-  #endif
-  
-!     capsstatus = status;
-  
-      /* Read the whole modules file into allocated records */
-diff -r -C 2 -P base/cvs-1.6.5/src/myndbm.c cvs-1.6.5/src/myndbm.c
-*** base/cvs-1.6.5/src/myndbm.c	Wed Jan  3 06:20:24 1996
---- cvs-1.6.5/src/myndbm.c	Tue Jan  9 05:33:08 1996
-***************
-*** 37,41 ****
-      DBM *db;
-  
-!     fp = fopen (file, "r");
-      if (fp == NULL && !(existence_error (errno) && (flags & O_CREAT)))
-  	return ((DBM *) 0);
---- 37,41 ----
-      DBM *db;
-  
-!     fp = CVS_FOPEN (file, "r");
-      if (fp == NULL && !(existence_error (errno) && (flags & O_CREAT)))
-  	return ((DBM *) 0);
-***************
-*** 77,81 ****
-      {
-  	FILE *fp;
-! 	fp = fopen (db->name, "w");
-  	if (fp == NULL)
-  	    error (1, errno, "cannot write %s", db->name);
---- 77,81 ----
-      {
-  	FILE *fp;
-! 	fp = CVS_FOPEN (db->name, "w");
-  	if (fp == NULL)
-  	    error (1, errno, "cannot write %s", db->name);
-diff -r -C 2 -P base/cvs-1.6.5/src/no_diff.c cvs-1.6.5/src/no_diff.c
-*** base/cvs-1.6.5/src/no_diff.c	Fri Sep  8 07:20:28 1995
---- cvs-1.6.5/src/no_diff.c	Tue Jan  9 05:33:08 1996
-***************
-*** 98,102 ****
-  	     * has been set to 1.  */
-  	    if (trace)
-! 		(void) fprintf (stderr, "%c-> unlink (%s)\n",
-  #ifdef SERVER_SUPPORT
-  				(server_active) ? 'S' : ' ',
---- 98,102 ----
-  	     * has been set to 1.  */
-  	    if (trace)
-! 		(void) fprintf (stderr, "%c-> CVS_UNLINK (%s)\n",
-  #ifdef SERVER_SUPPORT
-  				(server_active) ? 'S' : ' ',
-***************
-*** 105,109 ****
-  #endif
-  				tocvsPath);
-! 	    if (unlink (tocvsPath) < 0)
-  		error (0, errno, "could not remove %s", tocvsPath);
-  	}
---- 105,109 ----
-  #endif
-  				tocvsPath);
-! 	    if (CVS_UNLINK (tocvsPath) < 0)
-  		error (0, errno, "could not remove %s", tocvsPath);
-  	}
-***************
-*** 127,133 ****
-  			(server_active) ? 'S' : ' ', tmp);
-  #else
-! 	(void) fprintf (stderr, "-> unlink (%s)\n", tmp);
-  #endif
-!     if (unlink (tmp) < 0)
-  	error (0, errno, "could not remove %s", tmp);
-      free (options);
---- 127,133 ----
-  			(server_active) ? 'S' : ' ', tmp);
-  #else
-! 	(void) fprintf (stderr, "-> CVS_UNLINK (%s)\n", tmp);
-  #endif
-!     if (CVS_UNLINK (tmp) < 0)
-  	error (0, errno, "could not remove %s", tmp);
-      free (options);
-diff -r -C 2 -P base/cvs-1.6.5/src/parseinfo.c cvs-1.6.5/src/parseinfo.c
-*** base/cvs-1.6.5/src/parseinfo.c	Tue Oct 17 07:20:14 1995
---- cvs-1.6.5/src/parseinfo.c	Tue Jan  9 05:33:08 1996
-***************
-*** 48,52 ****
-      (void) sprintf (infopath, "%s/%s/%s", CVSroot,
-  		    CVSROOTADM, infofile);
-!     if ((fp_info = fopen (infopath, "r")) == NULL)
-  	return (0);			/* no file -> nothing special done */
-  
---- 48,52 ----
-      (void) sprintf (infopath, "%s/%s/%s", CVSroot,
-  		    CVSROOTADM, infofile);
-!     if ((fp_info = CVS_FOPEN (infopath, "r")) == NULL)
-  	return (0);			/* no file -> nothing special done */
-  
-diff -r -C 2 -P base/cvs-1.6.5/src/patch.c cvs-1.6.5/src/patch.c
-*** base/cvs-1.6.5/src/patch.c	Thu Jan  4 06:20:30 1996
---- cvs-1.6.5/src/patch.c	Tue Jan  9 05:33:08 1996
-***************
-*** 302,306 ****
-  
-      /* cd to the starting repository */
-!     if (chdir (repository) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", repository);
---- 302,306 ----
-  
-      /* cd to the starting repository */
-!     if (CVS_CHDIR (repository) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", repository);
-***************
-*** 428,436 ****
-  	return (0);
-      }
-!     if ((fp1 = fopen (tmpnam (tmpfile1), "w+")) != NULL)
-  	(void) fclose (fp1);
-!     if ((fp2 = fopen (tmpnam (tmpfile2), "w+")) != NULL)
-  	(void) fclose (fp2);
-!     if ((fp3 = fopen (tmpnam (tmpfile3), "w+")) != NULL)
-  	(void) fclose (fp3);
-      if (fp1 == NULL || fp2 == NULL || fp3 == NULL)
---- 428,436 ----
-  	return (0);
-      }
-!     if ((fp1 = CVS_FOPEN (tmpnam (tmpfile1), "w+")) != NULL)
-  	(void) fclose (fp1);
-!     if ((fp2 = CVS_FOPEN (tmpnam (tmpfile2), "w+")) != NULL)
-  	(void) fclose (fp2);
-!     if ((fp3 = CVS_FOPEN (tmpnam (tmpfile3), "w+")) != NULL)
-  	(void) fclose (fp3);
-      if (fp1 == NULL || fp2 == NULL || fp3 == NULL)
-diff -r -C 2 -P base/cvs-1.6.5/src/rcs.c cvs-1.6.5/src/rcs.c
-*** base/cvs-1.6.5/src/rcs.c	Mon Dec  4 06:20:22 1995
---- cvs-1.6.5/src/rcs.c	Tue Jan  9 05:33:08 1996
-***************
-*** 144,148 ****
-  
-      (void) sprintf (rcsfile, "%s/%s%s", repos, file, RCSEXT);
-!     if ((fp = fopen (rcsfile, "r")) != NULL) 
-      {
-          rcs = RCS_parsercsfile_i(fp, rcsfile);
---- 144,148 ----
-  
-      (void) sprintf (rcsfile, "%s/%s%s", repos, file, RCSEXT);
-!     if ((fp = CVS_FOPEN (rcsfile, "r")) != NULL) 
-      {
-          rcs = RCS_parsercsfile_i(fp, rcsfile);
-***************
-*** 166,170 ****
-  
-      (void) sprintf (rcsfile, "%s/%s/%s%s", repos, CVSATTIC, file, RCSEXT);
-!     if ((fp = fopen (rcsfile, "r")) != NULL) 
-      {
-          rcs = RCS_parsercsfile_i(fp, rcsfile);
---- 166,170 ----
-  
-      (void) sprintf (rcsfile, "%s/%s/%s%s", repos, CVSATTIC, file, RCSEXT);
-!     if ((fp = CVS_FOPEN (rcsfile, "r")) != NULL) 
-      {
-          rcs = RCS_parsercsfile_i(fp, rcsfile);
-***************
-*** 204,208 ****
-  
-      /* open the rcsfile */
-!     if ((fp = fopen (rcsfile, "r")) == NULL)
-      {
-  	error (0, errno, "Couldn't open rcs file `%s'", rcsfile);
---- 204,208 ----
-  
-      /* open the rcsfile */
-!     if ((fp = CVS_FOPEN (rcsfile, "r")) == NULL)
-      {
-  	error (0, errno, "Couldn't open rcs file `%s'", rcsfile);
-***************
-*** 308,312 ****
-  #endif
-  
-!     fp = fopen(rcsfile, "r");
-      if (fp == NULL)
-  	error (1, 0, "unable to reopen `%s'", rcsfile);
---- 308,312 ----
-  #endif
-  
-!     fp = CVS_FOPEN (rcsfile, "r");
-      if (fp == NULL)
-  	error (1, 0, "unable to reopen `%s'", rcsfile);
-diff -r -C 2 -P base/cvs-1.6.5/src/recurse.c cvs-1.6.5/src/recurse.c
-*** base/cvs-1.6.5/src/recurse.c	Sat Dec 16 06:20:33 1995
---- cvs-1.6.5/src/recurse.c	Tue Jan  9 05:33:08 1996
-***************
-*** 519,523 ****
-  
-  	/* cd to the sub-directory */
-! 	if (chdir (dir) < 0)
-  	    error (1, errno, "could not chdir to %s", dir);
-  
---- 519,523 ----
-  
-  	/* cd to the sub-directory */
-! 	if (CVS_CHDIR (dir) < 0)
-  	    error (1, errno, "could not chdir to %s", dir);
-  
-***************
-*** 631,635 ****
-          if (save_cwd (&cwd))
-  	    exit (1);
-! 	if (chdir (p->key) < 0)
-  	    error (1, errno, "could not chdir to %s", p->key);
-  
---- 631,635 ----
-          if (save_cwd (&cwd))
-  	    exit (1);
-! 	if (CVS_CHDIR (p->key) < 0)
-  	    error (1, errno, "could not chdir to %s", p->key);
-  
-diff -r -C 2 -P base/cvs-1.6.5/src/release.c cvs-1.6.5/src/release.c
-*** base/cvs-1.6.5/src/release.c	Tue Jan  9 06:20:21 1996
---- cvs-1.6.5/src/release.c	Tue Jan  9 05:33:08 1996
-***************
-*** 143,147 ****
-          if (isdir (thisarg))
-          {
-!           if (chdir (thisarg) < 0)
-            {
-              if (!really_quiet)
---- 143,147 ----
-          if (isdir (thisarg))
-          {
-!           if (CVS_CHDIR (thisarg) < 0)
-            {
-              if (!really_quiet)
-***************
-*** 273,280 ****
-      ino_t ino;
-  
-!     (void) stat (".", &st);
-      ino = st.st_ino;
-!     (void) chdir ("..");
-!     (void) stat (dir, &st);
-      if (ino != st.st_ino)
-      {
---- 273,280 ----
-      ino_t ino;
-  
-!     (void) CVS_STAT (".", &st);
-      ino = st.st_ino;
-!     (void) CVS_CHDIR ("..");
-!     (void) CVS_STAT (dir, &st);
-      if (ino != st.st_ino)
-      {
-diff -r -C 2 -P base/cvs-1.6.5/src/remove.c cvs-1.6.5/src/remove.c
-*** base/cvs-1.6.5/src/remove.c	Thu Jan  4 06:20:31 1996
---- cvs-1.6.5/src/remove.c	Tue Jan  9 05:33:08 1996
-***************
-*** 128,132 ****
-  	if (!noexec)
-  	{
-! 	    if (unlink (file) < 0 && ! existence_error (errno))
-  	    {
-  		if (update_dir[0] == '\0')
---- 128,132 ----
-  	if (!noexec)
-  	{
-! 	    if (CVS_UNLINK (file) < 0 && ! existence_error (errno))
-  	    {
-  		if (update_dir[0] == '\0')
-diff -r -C 2 -P base/cvs-1.6.5/src/root.c cvs-1.6.5/src/root.c
-*** base/cvs-1.6.5/src/root.c	Tue Dec 12 06:20:28 1995
---- cvs-1.6.5/src/root.c	Tue Jan  9 05:33:08 1996
-***************
-*** 136,142 ****
-      int ret;
-  
-!     if (stat (dir1, &sb1) < 0)
-          return (0);
-!     if (stat (dir2, &sb2) < 0)
-          return (0);
-      
---- 136,142 ----
-      int ret;
-  
-!     if (CVS_STAT (dir1, &sb1) < 0)
-          return (0);
-!     if (CVS_STAT (dir2, &sb2) < 0)
-          return (0);
-      
-diff -r -C 2 -P base/cvs-1.6.5/src/rtag.c cvs-1.6.5/src/rtag.c
-*** base/cvs-1.6.5/src/rtag.c	Thu Jan  4 06:20:31 1996
---- cvs-1.6.5/src/rtag.c	Tue Jan  9 05:33:08 1996
-***************
-*** 279,283 ****
-  
-      /* chdir to the starting directory */
-!     if (chdir (repository) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", repository);
---- 279,283 ----
-  
-      /* chdir to the starting directory */
-!     if (CVS_CHDIR (repository) < 0)
-      {
-  	error (0, errno, "cannot chdir to %s", repository);
-diff -r -C 2 -P base/cvs-1.6.5/src/run.c cvs-1.6.5/src/run.c
-*** base/cvs-1.6.5/src/run.c	Fri Dec 15 06:20:21 1995
---- cvs-1.6.5/src/run.c	Tue Jan  9 05:33:08 1996
-***************
-*** 216,220 ****
-      mode_err |= ((flags & RUN_STDERR_APPEND) ? O_APPEND : O_TRUNC);
-  
-!     if (stin && (shin = open (stin, O_RDONLY)) == -1)
-      {
-  	rerrno = errno;
---- 216,220 ----
-      mode_err |= ((flags & RUN_STDERR_APPEND) ? O_APPEND : O_TRUNC);
-  
-!     if (stin && (shin = CVS_OPEN (stin, O_RDONLY)) == -1)
-      {
-  	rerrno = errno;
-***************
-*** 223,227 ****
-  	goto out0;
-      }
-!     if (stout && (shout = open (stout, mode_out, 0666)) == -1)
-      {
-  	rerrno = errno;
---- 223,227 ----
-  	goto out0;
-      }
-!     if (stout && (shout = CVS_OPEN (stout, mode_out, 0666)) == -1)
-      {
-  	rerrno = errno;
-***************
-*** 232,236 ****
-      if (sterr && (flags & RUN_COMBINED) == 0)
-      {
-! 	if ((sherr = open (sterr, mode_err, 0666)) == -1)
-  	{
-  	    rerrno = errno;
---- 232,236 ----
-      if (sterr && (flags & RUN_COMBINED) == 0)
-      {
-! 	if ((sherr = CVS_OPEN (sterr, mode_err, 0666)) == -1)
-  	{
-  	    rerrno = errno;
-diff -r -C 2 -P base/cvs-1.6.5/src/server.c cvs-1.6.5/src/server.c
-*** base/cvs-1.6.5/src/server.c	Thu Jan  4 06:20:33 1996
---- cvs-1.6.5/src/server.c	Tue Jan  9 05:33:08 1996
-***************
-*** 392,396 ****
-  	return;
-      }
-!     if (chdir (dirname) < 0)
-      {
-  	pending_error = errno;
---- 392,396 ----
-  	return;
-      }
-!     if (CVS_CHDIR (dirname) < 0)
-      {
-  	pending_error = errno;
-***************
-*** 411,415 ****
-  	return;
-      }
-!     f = fopen (CVSADM_REP, "w");
-      if (f == NULL)
-      {
---- 411,415 ----
-  	return;
-      }
-!     f = CVS_FOPEN (CVSADM_REP, "w");
-      if (f == NULL)
-      {
-***************
-*** 428,432 ****
-  	return;
-      }
-!     f = fopen (CVSADM_ENT, "w+");
-      if (f == NULL)
-      {
---- 428,432 ----
-  	return;
-      }
-!     f = CVS_FOPEN (CVSADM_ENT, "w+");
-      if (f == NULL)
-      {
-***************
-*** 493,497 ****
-  {
-      FILE *f;
-!     f = fopen (CVSADM_ENTSTAT, "w+");
-      if (f == NULL)
-      {
---- 493,497 ----
-  {
-      FILE *f;
-!     f = CVS_FOPEN (CVSADM_ENTSTAT, "w+");
-      if (f == NULL)
-      {
-***************
-*** 515,519 ****
-  {
-      FILE *f;
-!     f = fopen (CVSADM_TAG, "w+");
-      if (f == NULL)
-      {
---- 515,519 ----
-  {
-      FILE *f;
-!     f = CVS_FOPEN (CVSADM_TAG, "w+");
-      if (f == NULL)
-      {
-***************
-*** 626,630 ****
-  
-      /* Write the file.  */
-!     fd = open (arg, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-      if (fd < 0)
-      {
---- 626,630 ----
-  
-      /* Write the file.  */
-!     fd = CVS_OPEN (arg, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-      if (fd < 0)
-      {
-***************
-*** 798,802 ****
-      {
-  	struct utimbuf ut;
-! 	int fd = open (arg, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-  	if (fd < 0 || close (fd) < 0)
-  	{
---- 798,802 ----
-      {
-  	struct utimbuf ut;
-! 	int fd = CVS_OPEN (arg, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-  	if (fd < 0 || close (fd) < 0)
-  	{
-***************
-*** 914,918 ****
-      if (!error_pending ())
-      {
-! 	f = fopen (CVSADM_ENT, "w");
-  	if (f == NULL)
-  	{
---- 914,918 ----
-      if (!error_pending ())
-      {
-! 	f = CVS_FOPEN (CVSADM_ENT, "w");
-  	if (f == NULL)
-  	{
-***************
-*** 1091,1095 ****
-      while (notify_list != NULL)
-      {
-! 	if (chdir (notify_list->dir) < 0)
-  	{
-  	    error (0, errno, "cannot change to %s", notify_list->dir);
---- 1091,1095 ----
-      while (notify_list != NULL)
-      {
-! 	if (CVS_CHDIR (notify_list->dir) < 0)
-  	{
-  	    error (0, errno, "cannot change to %s", notify_list->dir);
-***************
-*** 2300,2304 ****
-  #endif /* SERVER_FLOWCONTROL */
-  
-!     dev_null_fd = open ("/dev/null", O_RDONLY);
-      if (dev_null_fd < 0)
-      {
---- 2300,2304 ----
-  #endif /* SERVER_FLOWCONTROL */
-  
-!     dev_null_fd = CVS_OPEN ("/dev/null", O_RDONLY);
-      if (dev_null_fd < 0)
-      {
-***************
-*** 2943,2947 ****
-  	char *mode_string;
-  
-! 	if (stat (file, &sb) < 0)
-  	{
-  	    /* Not clear to me why the file would fail to exist, but it
---- 2943,2947 ----
-  	char *mode_string;
-  
-! 	if (CVS_STAT (file, &sb) < 0)
-  	{
-  	    /* Not clear to me why the file would fail to exist, but it
-***************
-*** 3217,3221 ****
-  	}
-  
-! 	if (chdir (tempdir) < 0)
-  	{
-  	    printf ("E Cannot change to directory %s\n", tempdir);
---- 3217,3221 ----
-  	}
-  
-! 	if (CVS_CHDIR (tempdir) < 0)
-  	{
-  	    printf ("E Cannot change to directory %s\n", tempdir);
-***************
-*** 3283,3287 ****
-  	char size_text[80];
-  
-! 	if (stat (file, &sb) < 0)
-  	{
-  	    if (existence_error (errno))
---- 3283,3287 ----
-  	char size_text[80];
-  
-! 	if (CVS_STAT (file, &sb) < 0)
-  	{
-  	    if (existence_error (errno))
-***************
-*** 3370,3374 ****
-  		pid_t gzip_pid;
-  
-! 		fd = open (file, O_RDONLY, 0);
-  		if (fd < 0)
-  		    error (1, errno, "reading %s", short_pathname);
---- 3370,3374 ----
-  		pid_t gzip_pid;
-  
-! 		fd = CVS_OPEN (file, O_RDONLY, 0);
-  		if (fd < 0)
-  		    error (1, errno, "reading %s", short_pathname);
-***************
-*** 3396,3400 ****
-  
-  		size = sb.st_size;
-! 		f = fopen (file, "r");
-  		if (f == NULL)
-  		    error (1, errno, "reading %s", short_pathname);
---- 3396,3400 ----
-  
-  		size = sb.st_size;
-! 		f = CVS_FOPEN (file, "r");
-  		if (f == NULL)
-  		    error (1, errno, "reading %s", short_pathname);
-***************
-*** 3427,3431 ****
-  	       join_file.  */
-  	    && !joining ())
-! 	    unlink (file);
-      }
-      else if (scratched_file != NULL && entries_line == NULL)
---- 3427,3431 ----
-  	       join_file.  */
-  	    && !joining ())
-! 	    CVS_UNLINK (file);
-      }
-      else if (scratched_file != NULL && entries_line == NULL)
-***************
-*** 3673,3677 ****
-  {
-      FILE *f;
-!     f = fopen (CVSADM_CIPROG, "w+");
-      if (f == NULL)
-      {
---- 3673,3677 ----
-  {
-      FILE *f;
-!     f = CVS_FOPEN (CVSADM_CIPROG, "w+");
-      if (f == NULL)
-      {
-***************
-*** 3702,3706 ****
-  {
-      FILE *f;
-!     f = fopen (CVSADM_UPROG, "w+");
-      if (f == NULL)
-      {
---- 3702,3706 ----
-  {
-      FILE *f;
-!     f = CVS_FOPEN (CVSADM_UPROG, "w+");
-      if (f == NULL)
-      {
-***************
-*** 3919,3923 ****
-      if (temp_dir == NULL || temp_dir[0] == '\0')
-          temp_dir = "/tmp";
-!     chdir(temp_dir);
-  
-      len = strlen (server_temp_dir) + 80;
---- 3919,3923 ----
-      if (temp_dir == NULL || temp_dir[0] == '\0')
-          temp_dir = "/tmp";
-!     CVS_CHDIR (temp_dir);
-  
-      len = strlen (server_temp_dir) + 80;
-***************
-*** 4160,4164 ****
-    memset (linebuf, 0, linelen);
-  
-!   fp = fopen (filename, "r");
-    if (fp == NULL)
-      {
---- 4160,4164 ----
-    memset (linebuf, 0, linelen);
-  
-!   fp = CVS_FOPEN (filename, "r");
-    if (fp == NULL)
-      {
-diff -r -C 2 -P base/cvs-1.6.5/src/tag.c cvs-1.6.5/src/tag.c
-*** base/cvs-1.6.5/src/tag.c	Thu Jan  4 06:20:33 1996
---- cvs-1.6.5/src/tag.c	Tue Jan  9 05:33:08 1996
-***************
-*** 729,733 ****
-  	    if (save_cwd (&cwd))
-  		exit (1);
-! 	    if (chdir (repository) < 0)
-  		error (1, errno, "cannot change to %s directory", repository);
-  	}
---- 729,733 ----
-  	    if (save_cwd (&cwd))
-  		exit (1);
-! 	    if (CVS_CHDIR (repository) < 0)
-  		error (1, errno, "cannot change to %s directory", repository);
-  	}
-diff -r -C 2 -P base/cvs-1.6.5/src/update.c cvs-1.6.5/src/update.c
-*** base/cvs-1.6.5/src/update.c	Thu Jan  4 06:20:34 1996
---- cvs-1.6.5/src/update.c	Tue Jan  9 05:33:09 1996
-***************
-*** 255,259 ****
---- 255,261 ----
-  			if (rq->status == rq_supported)
-  			{
-+ #ifndef macintosh
-  			    send_arg("-u");
-+ #endif
-  			}
-  			break;
-***************
-*** 275,279 ****
-  
-  		if (toplevel_wd[0] != '\0'
-! 		    && chdir (toplevel_wd) < 0)
-  		{
-  		    error (1, errno, "could not chdir to %s", toplevel_wd);
---- 277,281 ----
-  
-  		if (toplevel_wd[0] != '\0'
-! 		    && CVS_CHDIR (toplevel_wd) < 0)
-  		{
-  		    error (1, errno, "could not chdir to %s", toplevel_wd);
-***************
-*** 814,818 ****
-      /* run the update_prog if there is one */
-      if (err == 0 && !pipeout && !noexec &&
-! 	(fp = fopen (CVSADM_UPROG, "r")) != NULL)
-      {
-  	char *cp;
---- 816,820 ----
-      /* run the update_prog if there is one */
-      if (err == 0 && !pipeout && !noexec &&
-! 	(fp = CVS_FOPEN (CVSADM_UPROG, "r")) != NULL)
-      {
-  	char *cp;
-***************
-*** 837,841 ****
-      /* FIXME: chdir ("..") loses with symlinks.  */
-      /* Prune empty dirs on the way out - if necessary */
-!     (void) chdir ("..");
-      if (update_prune_dirs && isemptydir (dir))
-      {
---- 839,843 ----
-      /* FIXME: chdir ("..") loses with symlinks.  */
-      /* Prune empty dirs on the way out - if necessary */
-!     (void) CVS_CHDIR ("..");
-      if (update_prune_dirs && isemptydir (dir))
-      {
-***************
-*** 859,863 ****
-      struct dirent *dp;
-  
-!     if ((dirp = opendir (dir)) == NULL)
-      {
-  	error (0, 0, "cannot open directory %s for empty check", dir);
---- 861,865 ----
-      struct dirent *dp;
-  
-!     if ((dirp = CVS_OPENDIR (dir)) == NULL)
-      {
-  	error (0, 0, "cannot open directory %s for empty check", dir);
-***************
-*** 1207,1211 ****
-      else
-      {
-!         e = fopen (file1, "r");
-  	if (e == NULL)
-  	    fail = 1;
---- 1209,1213 ----
-      else
-      {
-!         e = CVS_FOPEN (file1, "r");
-  	if (e == NULL)
-  	    fail = 1;
-***************
-*** 1244,1248 ****
-  		    && !fileattr_get (file, "_watched"))
-  		    xchmod (file2, 1);
-! 		e = fopen (file2, "r");
-  		if (e == NULL)
-  		    fail = 1;
---- 1246,1250 ----
-  		    && !fileattr_get (file, "_watched"))
-  		    xchmod (file2, 1);
-! 		e = CVS_FOPEN (file2, "r");
-  		if (e == NULL)
-  		    fail = 1;
-***************
-*** 1303,1307 ****
-  
-  	    /* Check the diff output to make sure patch will be handle it.  */
-! 	    e = fopen (file, "r");
-  	    if (e == NULL)
-  		error (1, errno, "could not open diff output file %s", file);
---- 1305,1309 ----
-  
-  	    /* Check the diff output to make sure patch will be handle it.  */
-! 	    e = CVS_FOPEN (file, "r");
-  	    if (e == NULL)
-  		error (1, errno, "could not open diff output file %s", file);
-***************
-*** 1333,1337 ****
-  		  xvers_ts->tag, xvers_ts->date, NULL);
-  
-! 	if (stat (file2, file_info) < 0)
-  	    error (1, errno, "could not stat %s", file2);
-  
---- 1335,1339 ----
-  		  xvers_ts->tag, xvers_ts->date, NULL);
-  
-! 	if (CVS_STAT (file2, file_info) < 0)
-  	    error (1, errno, "could not stat %s", file2);
-  
-diff -r -C 2 -P base/cvs-1.6.5/src/vers_ts.c cvs-1.6.5/src/vers_ts.c
-*** base/cvs-1.6.5/src/vers_ts.c	Sat Dec  2 06:20:24 1995
---- cvs-1.6.5/src/vers_ts.c	Tue Jan  9 05:33:09 1996
-***************
-*** 220,224 ****
-      char *cp;
-  
-!     if (stat (file, &sb) < 0)
-      {
-  	if (! existence_error (errno))
---- 220,224 ----
-      char *cp;
-  
-!     if (CVS_STAT (file, &sb) < 0)
-      {
-  	if (! existence_error (errno))
-***************
-*** 280,284 ****
-      char *ts;
-  
-!     if (stat (file, &sb) < 0)
-      {
-  	ts = NULL;
---- 280,284 ----
-      char *ts;
-  
-!     if (CVS_STAT (file, &sb) < 0)
-      {
-  	ts = NULL;
-diff -r -C 2 -P base/cvs-1.6.5/src/wrapper.c cvs-1.6.5/src/wrapper.c
-*** base/cvs-1.6.5/src/wrapper.c	Tue Oct 10 07:20:42 1995
---- cvs-1.6.5/src/wrapper.c	Tue Jan  9 05:33:09 1996
-***************
-*** 97,101 ****
-  
-  	/* load the file */
-!     if (!(fp = fopen (file, "r")))
-  	return;
-      while (fgets (line, sizeof (line), fp))
---- 97,101 ----
-  
-  	/* load the file */
-!     if (!(fp = CVS_FOPEN (file, "r")))
-  	return;
-      while (fgets (line, sizeof (line), fp))