From 49269292b0c0d2e7123d1f796b95734cc88f12b1 Mon Sep 17 00:00:00 2001
From: chombier <>
Date: Wed, 28 Mar 2001 14:05:07 +0000
Subject: [PATCH] GUSI 2.1.6b2 update

---
 GUSI/MacDistr                         | Bin 721 -> 1157 bytes
 GUSI/README                           | Bin 17148 -> 17955 bytes
 GUSI/include/GUSIContext.h            |  15 ++++-
 GUSI/include/GUSIDescriptor.h         |   6 +-
 GUSI/include/GUSIFileSpec.h           |  10 +++-
 GUSI/include/GUSIOpenTransport.h      |  17 +++++-
 GUSI/include/fcntl.h                  |   2 +-
 GUSI/include/unistd.h                 |   8 ++-
 GUSI/src/GUSIContext.nw               | Bin 39670 -> 41124 bytes
 GUSI/src/GUSIDescriptor.nw            | Bin 11979 -> 12991 bytes
 GUSI/src/GUSIFileSpec.nw              | Bin 41817 -> 42478 bytes
 GUSI/src/GUSIMPW.nw                   | Bin 14074 -> 14785 bytes
 GUSI/src/GUSINetDB.nw                 | Bin 19184 -> 19646 bytes
 GUSI/src/GUSIOTInet.nw                | Bin 25517 -> 25982 bytes
 GUSI/src/GUSIOTNetDB.nw               | Bin 8956 -> 9515 bytes
 GUSI/src/GUSIOpenTransport.nw         | Bin 43977 -> 45730 bytes
 GUSI/src/tangled/GUSIContext.cp       |  46 ++++++++++++---
 GUSI/src/tangled/GUSIDescriptor.cp    |  33 +++++++++--
 GUSI/src/tangled/GUSIFileSpec.cp      |   4 +-
 GUSI/src/tangled/GUSIMPW.cp           |  16 ++++--
 GUSI/src/tangled/GUSINetDB.cp         |   2 +-
 GUSI/src/tangled/GUSIOTInet.cp        |   4 +-
 GUSI/src/tangled/GUSIOTNetDB.cp       |   6 ++
 GUSI/src/tangled/GUSIOpenTransport.cp |  59 ++++++++++++++------
 lsh/MacOS/src/GUSIPatches.cp          |   6 +-
 macssh/source/ssh/GUSIPatch2.cp       |  77 ++++++++++++++++++++++++++
 macssh/www/download/ChangeLog         | Bin 12702 -> 12732 bytes
 27 files changed, 257 insertions(+), 54 deletions(-)

diff --git a/GUSI/MacDistr b/GUSI/MacDistr
index 57a2c3384497d23244cf86f3db5a96384437d444..61fdb25884be628d19b8c2d11f39e308cf6f36ee 100755
GIT binary patch
delta 481
zcmcb}+R8aWQjwW~fq@Z-?HCxC8i6zu5bXyFEd#PS85menC+fK}n<W`-EU{&(hbUzX
z1j>PMC=k;V0PP=80I}b->V})6{Zk_Y1{R=eKw-zQ?er-H5C*Z40Y`F1er{4`Y7tP7
z!#6S6C9}8$#D)MCpk|<UkO_z&4fYQTVd`RNV31*OV_@_RcX9$s3ngb~rZ6yQGRQH1
j`2Qa$;0ZRN0Zf7kzJQ|qtkmR^{2~RH#FE6x8<`XU5xy$C

delta 41
scmZqWyvRC1Qk02-fq@Z-jTji1>VY&Tklr}a%9YV{W0Nh@<Wv>~0E)&3X#fBK

diff --git a/GUSI/README b/GUSI/README
index cdf059ec1ef3da3d0268616db7f9bcd967c7e413..65cef6dc882e2310420ba4ee43e9ccf9d22f4194 100755
GIT binary patch
delta 1008
zcmY*Y&ubGw6rLouG(ze{Jc!5xMO)FBY@vvhmL&Z_OScVaYQWILWb=|tvzb|DXPXw0
z3gSgP6mrv}e}NPV9=+;K@F4W4coOvBO{j0O5Ov`(v+vFO-uJ#Y^ZQxi^^3&O^-HC9
zjIktRr88R2(LT-Ca_Y_f)5NiptfUs86lsmpz#i&QC>erk!OHg5Ds=cBLIY8Pr+R_#
zu?c-)I<Qq;50o}Alg($H!PBwNiTv@-_}lU0yO~PjaJJ#3ot(>cE}zN39jJB?B=#Xh
zA3ZZQO<+yy!6xB_s)wL)PsEk$HBPab@O{C1;Z8P_c@UEVhic6>^6A{YzsRmV+!Io1
zFn#3R5R8Ju9`9nzzpr$c_#1;dCceRqIe@7}C2tzwVHXb2OlK|0WwB3edVH6#8c{n0
zA&HjHjUWjEPEEH_qNaZ(hY4=EM%9!bLLW6kBzeQfVSN>lU@cOMLLK3C;sZl3Czp^-
z)ej*9>3X%JdgQ8Mo1kxl%e^vcABs^Mt~oRLTyA#9a@!7xT9ec>NQkyt{8Qh7KBe;@
z&??Y^Q<(Id|6f4c+p6uY!)4PKvTdg;(G0cmlx&H16t@K)9cd4aE?zy1)!-nbUW2rw
z3}3Z{7b`QAg#bzG(ManqHOkS4HPw-!k~BFgT=J1iP?3Sw2JV}65gIEZ@Rpqj_dE>j
zeW<S~ggrW0jU?JscQlYv4a!>W(!H_eg!KG~+6x2pM2q+|g{F|wg0!Y4NE<NJ1UxFm
z_f<b89>-?#laqc$7vGu~@WPitP`EH($`wA|TKMYZn0*upGIsLeJy^5*f4>QjCe;wA
z$vIwGDlEE7gSq0|Vd_`%Im@#1c0KtP{bX#c8(R!$K@+3OTbq??@+Eu1uCRwJ>6W)D
w6u#`%ibYy)cwNz?)k%Fnqld~i$yn;gaKB>rlsEb&V^Jokby(zv4^E5l2mcK>)&Kwi

delta 268
zcmZ47!}zC_ae|7NBMSoq0}}&-qZ0!I<18SXlYznM&PJ;{j4}%4nI#ztzNsZe`Q@oa
z*~JRZ`6;R4iA6=3`9+(>n1YxmuVB5wXt24FZ6}+gO<rnhQKmy?X0cvss$ObIMwMQ2
zh8-s-=VmM3AjZvhf+vhPLx9GEu-jxomyeU(T}|s5PcStw=rM4C=xxVc-GGvCzzAf4
zF<e`)e^3aM5<>%n41*g3qi;ZP5KxJbZ@3fC?F@3vZ~y-X(i}j{!2AKs1~C~zTq8o9
T!#!PrX5}zE1Pj3kRxkqq(cwH|

diff --git a/GUSI/include/GUSIContext.h b/GUSI/include/GUSIContext.h
index 8709b33..dfb0c2f 100755
--- a/GUSI/include/GUSIContext.h
+++ b/GUSI/include/GUSIContext.h
@@ -5,6 +5,9 @@
 // % Language	:	C++                                                        
 // %                                                                       
 // % $Log$
+// % Revision 1.1.1.1  2001/03/07 09:50:40  chombier
+// % First Imported.
+// %
 // % Revision 1.1.1.1  2001/03/03 21:50:10  chombier
 // % Initial import
 // %                                              
@@ -337,8 +340,7 @@ protected:
 	GUSIContext(ThreadID id);	
 	GUSIContext(
 		ThreadEntryProcPtr threadEntry, void *threadParam, 
-		Size stackSize, ThreadOptions options = kCreateIfNeeded, 
-		void **threadResult = nil, ThreadID *threadMade = nil);
+		Size stackSize, ThreadOptions options, void **threadResult, ThreadID *threadMade);
 
 	virtual void SwitchIn();
 	virtual void SwitchOut();
@@ -398,6 +400,7 @@ protected:
 
  static Queue			sContexts;
  static GUSIContext *	sCurrentContext;
+ static bool				sCreatingCurrentContext;
  static bool				sHasThreading;
  static OSErr			sError;
  // The [[GUSIContext]] constructor links the context into the queue of existing
@@ -411,7 +414,7 @@ protected:
  // Destruction of a [[GUSIContext]] requires some cleanup.                 
  //                                                                         
  // <Privatissima of [[GUSIContext]]>=                                      
- ~GUSIContext();
+ virtual ~GUSIContext();
 };
 // [[GUSIContext]] instances are created by instances of [[GUSIContextFactory]].
 //                                                                         
@@ -420,6 +423,7 @@ class GUSIContextFactory {
 public:
 	static GUSIContextFactory *	Instance();
 	static void 				SetInstance(GUSIContextFactory * instance);
+	static void 				DeleteInstance();
 	
 	virtual GUSIContext	* CreateContext(ThreadID id);
 	virtual GUSIContext * CreateContext(
@@ -431,6 +435,11 @@ public:
 protected:
 	GUSIContextFactory();
 };
+// To make it possible to install an alternative [[GUSIContextFactory]], we provide the
+// [[GUSISetupContextFactory()]] hook for overriding;                      
+//                                                                         
+// <Definition of class [[GUSIContextFactory]]>=                           
+extern "C" void GUSISetupContextFactory();
 // Many asynchronous calls take the same style of I/O parameter block and thus
 // can be handled by the same completion procedure. [[StartIO]] prepares   
 // a parameter block for asynchronous I/O; [[FinishIO]] waits for the I/O  
diff --git a/GUSI/include/GUSIDescriptor.h b/GUSI/include/GUSIDescriptor.h
index 7c947b4..69aabfe 100755
--- a/GUSI/include/GUSIDescriptor.h
+++ b/GUSI/include/GUSIDescriptor.h
@@ -5,6 +5,9 @@
 // % Language	:	C++                                                        
 // %                                                                       
 // % $Log$
+// % Revision 1.1.1.1  2001/03/07 09:50:41  chombier
+// % First Imported.
+// %
 // % Revision 1.1.1.1  2001/03/03 21:50:10  chombier
 // % Initial import
 // %                                           
@@ -114,6 +117,7 @@ public:
 
 	static void SetInstance(GUSIDescriptorTable * table);
 	
+	GUSIDescriptorTable();
 	GUSIDescriptorTable(const GUSIDescriptorTable & parent);
 private:
 	// \section{Implementation of [[GUSIDescriptorTable]]}                     
@@ -123,7 +127,6 @@ private:
  // <Privatissima of [[GUSIDescriptorTable]]>=                              
  GUSISocket *	fSocket[SIZE];
  int				fInvalidDescriptor;
- GUSIDescriptorTable();
  // <Privatissima of [[GUSIDescriptorTable]]>=                              
  static	GUSIDescriptorTable	* sGUSIDescriptorTable;
 };
@@ -141,6 +144,7 @@ private:
 //                                                                         
 // <Hooks for ANSI library interfaces>=                                    
 extern "C" {
+void GUSISetupDescriptorTable();
 void GUSISetupConsole();
 void GUSIDefaultSetupConsole();
 void GUSISetupConsoleDescriptors();
diff --git a/GUSI/include/GUSIFileSpec.h b/GUSI/include/GUSIFileSpec.h
index e9507b5..b4bf8b9 100755
--- a/GUSI/include/GUSIFileSpec.h
+++ b/GUSI/include/GUSIFileSpec.h
@@ -5,6 +5,9 @@
 // % Language	:	C++                                                        
 // %                                                                       
 // % $Log$
+// % Revision 1.1.1.1  2001/03/07 09:50:44  chombier
+// % First Imported.
+// %
 // % Revision 1.1.1.1  2001/03/03 21:50:11  chombier
 // % Initial import
 // %                                             
@@ -333,8 +336,11 @@ public:
  // [[operator+]] provides a non-destructive variant of [[operator+=]].     
  //                                                                         
  // <Manipulating a [[GUSIFileSpec]]>=                                      
- friend GUSIFileSpec operator+(const FSSpec & spec, ConstStr31Param name);
- friend GUSIFileSpec operator+(const FSSpec & spec, const char * name);
+ //
+ // These don't need access to the GUSIFileSpec internals
+ //
+ // friend GUSIFileSpec operator+(const FSSpec & spec, ConstStr31Param name);
+ // friend GUSIFileSpec operator+(const FSSpec & spec, const char * name);
  // Array access replaces the file specification with the [[index]]th object in the
  // {\em parent directory} of the specification (allowing the same specification to
  // be reused for reading a directory).                                     
diff --git a/GUSI/include/GUSIOpenTransport.h b/GUSI/include/GUSIOpenTransport.h
index 4b97e90..e47560a 100755
--- a/GUSI/include/GUSIOpenTransport.h
+++ b/GUSI/include/GUSIOpenTransport.h
@@ -4,9 +4,15 @@
 // % Author	:	Matthias Neeracher                                           
 // % Language	:	C++                                                        
 // %                                                                       
-// % $Log$
-// % Revision 1.1.1.1  2001/03/03 21:50:13  chombier
-// % Initial import
+// % $Log$                                        
+// % Revision 1.21  2001/03/20 08:12:55  neeri                             
+// % Further select repairs                                                
+// %                                                                       
+// % Revision 1.20  2001/03/20 02:35:21  neeri                             
+// % Refined new select() implementation                                   
+// %                                                                       
+// % Revision 1.19  2001/03/09 09:25:21  neeri                             
+// % Fixed select logic bugs, listener queue                               
 // %                                        
 // % Revision 1.18  2001/01/17 08:58:06  neeri                             
 // % Releasing 2.1.4                                                       
@@ -231,6 +237,11 @@ public:
  //                                                                         
  // <Overridden member functions for [[GUSIOTSocket]]>=                     
  virtual int ioctl(unsigned int request, va_list arg);
+ // Before we call [[select]], we check whether there is data currently available and turn
+ // off the data flags otherwise.                                           
+ //                                                                         
+ // <Overridden member functions for [[GUSIOTSocket]]>=                     
+ virtual bool pre_select(bool wantRead, bool wantWrite, bool wantExcept);
  // [[getsockopt]] and [[setsockopt]] are available for a variety of options.
  //                                                                         
  // <Overridden member functions for [[GUSIOTSocket]]>=                     
diff --git a/GUSI/include/fcntl.h b/GUSI/include/fcntl.h
index dcdb95b..ca7f0d2 100755
--- a/GUSI/include/fcntl.h
+++ b/GUSI/include/fcntl.h
@@ -122,7 +122,7 @@ int	fcntl __P((int, int, ...));
 /* This properly belongs into stdio.h, but that header is outside of
    GUSI's control
 */
-#ifdef __MWERKS__
+#if defined(__MWERKS__) && !defined(_SFSTDIO_H)
 FILE * fdopen(int fildes, char *type);
 #else
 FILE * fdopen(int fildes, const char *type);
diff --git a/GUSI/include/unistd.h b/GUSI/include/unistd.h
index 6daead1..4410edc 100755
--- a/GUSI/include/unistd.h
+++ b/GUSI/include/unistd.h
@@ -58,6 +58,12 @@ int	 close __P((int));
 size_t	 confstr __P((int, char *, size_t));
 int	 dup __P((int));
 int	 dup2 __P((int, int));
+int	 execl __P((const char *, const char *, ...));
+int	 execle __P((const char *, const char *, ...));
+int	 execlp __P((const char *, const char *, ...));
+int	 execv __P((const char *, char * const *));
+int	 execve __P((const char *, char * const *, char * const *));
+int	 execvp __P((const char *, char * const *));
 long	 fpathconf __P((int, int));
 char	*getcwd __P((char *, size_t));
 gid_t	 getegid __P((void));
@@ -142,7 +148,7 @@ int	 sethostname __P((const char *, int));
 int	 setkey __P((const char *));
 int	 setlogin __P((const char *));
 void	*setmode __P((const char *));
-int	 setpgrp __P((pid_t pid, pid_t pgrp));	/* obsoleted by setpgid() */
+int	 setpgrp __P((void));	
 int	 setregid __P((gid_t, gid_t));
 int	 setreuid __P((uid_t, uid_t));
 int	 setrgid __P((gid_t));
diff --git a/GUSI/src/GUSIContext.nw b/GUSI/src/GUSIContext.nw
index e1e8ea9a74334b6685b73e31834440aca16c142c..5f33b1dc8c02ed63ff93b8c855a26d1dfa99afc9 100755
GIT binary patch
delta 1420
zcmc(fPe>GT6vt=O$W_M5{#X(9N|Ie7ciU31EhX0qF}2iKDrB3Td9yn?{(jqUe!C`7
z<|U|0;SUN5szb*jVySC%E$G;#V?;p*gP=o~dNZ1pBy_4DJbwS)e%^1s@4fx<r0V|j
zs_PrJR%@E3lXYs^org46(fpB)9?&|XY4>hEZq@a+<ZgguBC#u;*d0%FK%!%BvVCu&
z4S*pE*Vqmt6KIb4;BWy0rj(Q5mx`6s`h^yCF~6e{i{8?=_|lZF1!eBq5TVh79!l(G
zbj~b{R-VOXntCCFP%z5~k^_zxJw6G>sZ)MhApMx-(<LF0$uwsY&&kozz|9Pa%=9U$
zK&vEtmos1KSKAdEji_q}CL5ro1-33g)Yk(&?SBNqevqPsDI*f`e-A}BbQqb*uTfjD
zPQ9^Ks$BPaAh)GJj_LVWndnZ|)&B5NSB|`0*i;Vo@2jgVyF!*s4=U4{_qwXduUxfA
zmRPEiI}xwnIl^Jw97Av=6uIxaIWN@64dnAYFd3MhM8Qa=GOAC}CUv)dS!Yr3vTKuP
z0ZGQg$A^1|QI?AH`W-SY$;D(eMnV=i9}CmR%P53vlh`TsYDGM@-yo$44BOJ%=90Gr
zM$Hbyr<z^IMhCLl{-Ja>Ycv;ynIAWSahG{6!>m(c7AyfUnvvPAWBg=f4i5DV|AMh8
z@7XyLaQ4IB2n!&D)&yUtx}0^%zk>+$QO<K_QgPLJW4W?pYt=NaZcG{T6`SMS3ko(8
z94`w6RG;mk`fwG4^HdnYO>4OSrG%FF%xH}2>w=+n;6~Mly=r!Ft$Kw0%fnPMOP#&E
zj`op_iwnV^Kz7(O>JqN0CP?@m3YbW#W6t_Y%DKH~YOb6047G1y$I1TXp!olF%*F3J
zS(yIN^)8vvYUnk=-<$UI<%^EM7Qe36D)8}~i-Im1f{e}gMk||GaIGN(K?2TCVTT8Y
zMyiwAC2f;-NYnc>-Q9HE7`Mh;n--g^KYjZ~^B|c<P79;qsNiQX=sV~!rKw)ug7558
BbgBRV

delta 313
zcmZ2-km=i2rU{agObiSRj6iI}z%Xk&kmdx^FM+he<c%CI6PtD#8tMU|f`XBOfuX*E
zF%T&j8CsbdSQ%R=C?sd(=O$&Q7V)Yoc;;o6WG3b)Wae%zV60V}+@lq_SyiK#ar0Hp
zKJm#(;X0EI`Zy<_kK>&D+OcwSgOiy`X;D#XUWs#lUP)?2iGr;HFDEBwUTV35duXsH
zR8(WKp{od^=H?)0Bd*D7d=GD)=O@awd3VHf#?2?AG`S};HEU0Hm?gpwRqmFUT#{c@
zX*by+Q;d;!@<dJ1$=MlJY<lUbB^sKOxidXsOvOOa$-LQ|lZ!H4)DlZe^5Y9iifoYV
ag&CxgnO9trn3tTYxmhJ^i^=4c1quM*U1r$;

diff --git a/GUSI/src/GUSIDescriptor.nw b/GUSI/src/GUSIDescriptor.nw
index 3dcf4966d4809e4116b7821e8de822feacfe1226..33fa1f5f017e462c210332b88992259f189eb8a4 100755
GIT binary patch
delta 900
zcmX>dyFYb;q#`o|0|O%v+c7X0oB+~H3=D>BK%w<OHYWpv(bkQ6?EFlc)|=(|{TZ2U
zY<wp>avD#5pvE>iT~~GUGl5Txye_H5$wiq3CHX}miAj_H3Q2FiFJ#9krK8{;8tfUI
zT2fkoq9P}Cv#f|H<K+J$>XQ>WMJF4JHmc)NsiA4j%gG5unQ00dip7%~d4<_Dfm}`y
zQ)Kc<Q8~+6Ua(}bUutTKbADcNeoiXbPECbsph65`1zUx*#GK+(Yu?EUV&apn#s1WL
zrs*i8<rgU==2a>br6v~V=jkYvWTYyjq^2d7=9B<wnEw<?5|eU(68Wjc3VHcJnS8Lq
zto$Uf0hRfsItuw^sYOMZDXF~C(YSmS8>`1_W8(rfeln-1EHEI1Czna&ilK#+h9++{
zZ!PcS00s5Q{}gy9JID#}qbb>JDqbdD4~ay^C}6CCa3~Pd69DZWPyn&t&t`^3p8ZoJ
z0|pkLYe1=*VcY3bmLQDoI*#Ow{M@9>)FPmSASj*?p{kcx4p+?rGzDl5$S6eE2Kxtv
zFx4?MFvu{tF);duJ2^2JF)#=vXJ@7W)yXk``2QbB2Z0S~0Fz*XFQ6ztD>WIIO%z-b
LOA;rq)>8lg!8W-H

delta 136
zcmdm=dOCK3q$Cpq0|O%v8!<5G^#f^6Abk)>D@=5B-q?76Z*wHSCFA6YV&a=82?R4u
zwijmK%qwii$j+;rnwOH9Hd$9dZ}KdW2a~soHcd_v7oXfKCNp_85FZnhli+j@4fYI9
jEh#N<&d)2(&q>wLwC3gHteyN_?BC`Z$rAC&^Nkb$nUpAl

diff --git a/GUSI/src/GUSIFileSpec.nw b/GUSI/src/GUSIFileSpec.nw
index 19653624c043d23ceedff3331d54aab09e474501..64ee0c9cd624e97a975eebc580c7d1788fc0ca25 100755
GIT binary patch
delta 793
zcmc&yL2DC16rLnS-NRP!RuFj}ib%@tWH(W=qCy%X6<ceQqR`WJ_a&K_%!JuVQ+laC
zLD`cRFIDg&Jp}v-7VO1quLZB-O+3}NL>lo2=!1{<=DnHkee-5cKIOk1=U*;dFEGY(
zgnNt~{2-ra>}`coA1JmMdw2TE`MG}^z~j8+a^Lkha4+!7f#(58L@n$^SXP4pN`o<|
zk%4yDPY~K#po|lHk?I?`BNCw`l$_G785getuLd3uD*lYCA$Eyp5cZUY?NKKIAs0Yn
zKQv+oVHlb&bWozEwUU#qT+6SyuI;+e>LRs`mAqjxVKIbJgh>KMf$1VV*leyeL?4?&
zjEK{qmZXyoW@ppG^25T^`;(<gxt6Z&T}YkeqIc7_tYR@5X-yZrV_SVCI~K{Q3%ydm
z3%?6aJEL`mAtlo%<E_cjSQq!Flg&M&QD)dA{7a+$|JA1bA1!}*|N8z{kFz;alYKSz
z@%VF);cs=9qOKZj3)ED&{O5Z)a(upbjyQ-VBbrUN`FNvMc*9<>tE|Ctt50h+D)TGR
ia}iT;t?>QqjQl!*(WY~oU)QRKk)f|v4^5a>58xNM{E@l<

delta 156
zcmaENn(5{-rU{agObiSRj6iI}z_3^vNOJ;dUm&e8(b0Kg<0cb5Lp?(U1tS9kLwy5d
zAW|?gv@$iYG64!EXXNK5Wu_MKsw#NqWtL<n<|t(57UUO|Y(C8xVmvv~)C-7>CuIt4
z{%oq`H2G`=&*c0H2Z@~gymZc@)Et-0B2O1vg_O)9y@Es_bMu;tQtip-mMQ=MrI9c6

diff --git a/GUSI/src/GUSIMPW.nw b/GUSI/src/GUSIMPW.nw
index 8785b8257801b34a385e25e0481e3c8f95886a16..b25d7d521594248b8b801a6bcdff6dc7d4e6c335 100755
GIT binary patch
delta 802
zcmc&yL2FY%5Z*LF`ot7bsV$T;uac6qF?~s6H4zLA#Zn|RH7z+vDckoZ$*Y@Pc`r4G
zw6u2-D%&67Q3-ezJ=TjCLA-eKY%jfdN#`X{LGL>7F}vUF%r`sCujU8;Xxt1l#zKS#
zjNLsUKg8I*VWM8s*<dX9=2hzFK^7omS?M`ze$L8)mCI++`8#O<iRih}7?jFYXelLp
zXrqU)EBUrSVn97Z2{l(BMH;T%7{vQ5C(4zMYWwhHy`h?PuVP)ImxL0x%jgLx?$+T}
zW<DLUtcA_)TBtWV;ox)EMv%OTew0fGlmsqBUqip2$?5`J(Z^$7uA6~sYQ<mbC&Ux5
zx7Y2Af4-#8%&e}%*CFWWf;l_04=8*Dw+8XQQl_WDth7jFQ7DNTV#(12bfShq|J|~M
z@-bd>68EEqK91eKN_t7C310UDY9I8D`9dGvjObMu>n5h&-Z&UcI#i+22G}6{OC$aN
zY6Jb{kKc`#g&!G<MW~x#_1L>lC;0$>b~kL(UTnMQQQ-3OMrDQOo|5g0XAw%L0zr-6
zL#?bnUJp;PLpH%4vQVj7EK>NI{nT}4=`a~S?e)k%A~1S%VIyTv?V#OK9xU+|*WVW4
E98&j`a{vGU

delta 169
zcmX?D{3~~Yq$Cpq0|O%v8!<4LZ3ohvK>8(+R+#AMJh5?wiJqaJp@M>ufq|jEfiVy%
z7#Uib8d#Z_Dkvmp<mV=3rWWz4DtP8)mSiU8C}idq<QJ7}Uc>lbj6E+gH?>%gcXA`I
z;baA6p2_TzSB26tb5iv@i(OL7GLus^G!@j;Houp=z&2S&S!VKQg&UL4Dr!$&sMI}q
Rzk<nT59N&_lNVYl008UJGqnH!

diff --git a/GUSI/src/GUSINetDB.nw b/GUSI/src/GUSINetDB.nw
index 95594c5af4248d1e9b848307d02edd1b718983c4..654b56b3e7ca7ad5c7fc447709c9461c36aa9c7a 100755
GIT binary patch
delta 567
zcmew`m2uxp#tD*&%nS?+j6iJ1z~FTpNHZ}oc(Ve9Rsq?Z3=BT&H|nu6dKoGx7#SEC
z>KhpA8(1nBSXvnwS(#cWDCDK47G?6PDufoNrYNMO=A@RSDwJoW7NtTt(Xk5UiNy+u
z1qDU<1x1;OC8?X!8FM_CqGKmt_WWB9v6?XyXcr6vnREj{`v(+2?Dy<1n2}`v)X0E=
z1?U=3Trg}qeaaSu(Ot)poROcKl$lxtl;Cj>4fga)Epc(u%PWT~WC0ogGy-G_B3Og{
zgF={<7#bL47~B{beZ!rcfYL(A*}9o2K!zOihyVY9v@Z}d02RRjUqDfQR%&udevyJp
LVoBoU3tkEUZ#76D

delta 107
zcmdltlkvk;#tD*=ObiSRj6iI}z~HqWNOJ<|hd^3k@<tYyiA{S=^bGY36%>pN3=H)R
zjDbkO$k58vz{<p2K_NLKKQ}2ewTM?$!80$jBr`EbAv3oizo=w$Cu5Gs<nNw;C(rXy
F0036_9vuJx

diff --git a/GUSI/src/GUSIOTInet.nw b/GUSI/src/GUSIOTInet.nw
index bb90800871140693d67003a9b32db32789089ba8..c9b789df1e9aead932197141d8e56f63242d3bfc 100755
GIT binary patch
delta 576
zcmZ2`oblf&#tD*&%nS?+j6iJ1z>wSyq?v&9QJ~OjAe)ncA+=zl-ajuR1qCAm14DfS
zV|@cl1p`YfBO@zQ3k8L|)YPI(UR8zA;?xv{l+>Kml2nEAjMSo3C?`5rp**ozA+eyK
zD8Ha6GqEIfa{{BkB~x_l=Ji&o%ph9Cu2Qug;snMppq(Hb3dHmTK>G(2K<xKA!n*6P
z{Zk_Y1{R=eKykvb?er;I5Jq<$M{-7fZc=7y5m18HJv7+UKg2UHwL~wk9IlcDXadj-
zkTHmG4fYQTVd`UOV31*OV_@_RcX9$s3nlAiXQluda?Bt8{|C~3K+FJC1P6QpMfq8&
R$tC$k3NDEyiIaPi6#(hQOuYaA

delta 113
zcmex&igE36#tD*=ObiSRj6iI}z>u5^q&b1~d?2kb`6G+##OAFgdWL$23JOLB28Q|u
z#z3TCWN2k-U}a*dppcxApPQ7KTEwfW;F*_Ml9`yJkeOSMUsSTWiP7J3^JS}4=FL`i
Km8z5DQWXFs(jP7W

diff --git a/GUSI/src/GUSIOTNetDB.nw b/GUSI/src/GUSIOTNetDB.nw
index 9878e033fa0e337397f069da697f45e9c2ea4492..ccedfa4660b6df5426848cb745dd43f3414eaf45 100755
GIT binary patch
delta 591
zcmez4y4q`kq#`o|0|O%v+c7XGn*eDhAYB9$S_5QrGBBvhZPa_jFOZs3oT|Xf$;p|Q
zT9T5aYd86#ps-k8W{x$dzP^HUPCigpO`#|?zaTYlGq1oAMvKfe1&y@evSdw#YLGVn
z5U`?vqWrSVl++@Klr=~Oq)5S50b~}CTf6z3AfI48#7T_dKsSJJC=k;V0PP=80I}bj
zTdtVd{;81x0}IeKpg3aKcKVbp2&21>BRL~KHz_j}7;y}I?xDe+{vm#;B`!{SdF61W
zEI=cGhJegL1Z=Q>PzW;<Lj!{hgBt^*Z@7~aP+CYoIXg22$dF_H@c%!M_6K4HpdvWn
W14d+4YH~?_k%CKNN#f)?N(ulE0ZNbn

delta 57
zcmZ4O^~ZIBq$Cpq0|O%v8!<2_?FG`DK>9t9R+#AMys>dM|KvPAj?D=II~g~J2yqKe
I=2lez0BST1L;wH)

diff --git a/GUSI/src/GUSIOpenTransport.nw b/GUSI/src/GUSIOpenTransport.nw
index 6abe42ef15a41eabc421876a4425dfa7f2ae8bdb..6c11660b658f40d6f207f6c6f1aa350b032381d2 100755
GIT binary patch
delta 2158
zcmc&$O-vg{6kY?V*d|NbhW;c<(L*ZKMqq3MYQdN^6qC{hOu>jqjth%-Y)@Erx3lY?
z1gLYV+N$EGnOk#7%ZYGlW3}h1x2A_4bM1vg50$u8suZPf);1UvRca6Ii1GY?@0<7D
zH_K0t8ou6d*goIhC`pnB>xd+MvxjX1w!h)j1MJI^^x*Cn{>P<I5Fiu?1bYL0y`caE
z-W&>sh6V-z3_=)HI$%7<oGf8r6P=_SV8l`>vy~29njv{=Q`3N;ACDe`2@UlP3<>NS
z%nV6WgJ?J|RH3{+pevfClNDk(s)INuL4$)wpn*XM3=V~kgO1Z8LROjSW`?F<DVMRk
zL8rDu3}pRbj^s#r(G%?B+x^~`Iy<4=n~vtuB6LE0;p)U}JUUhWuK%4=&sL`+5GemS
z_)BYPl%!2Ypg<s{>N+G66+6jfw>y_5sbwf+iR&EkLx9?#sg4S%9AjufzX@tyrMkML
z6HpBeoE$S0Go1$9UfG$})r<|MI9{MO@hii_u{>dnY8rnv*3S<<Kh<wBvQRPYT{2A_
z3aa7E5LN4j!{I!m4yhYQ`Q&a7KM0-S$>h1~{|2C#B9`M*Ru$Q%x5$Dc+qc4stjIJC
z-WmZwZ}KlU+Al>SupEm|nPYhQC}TcFmTNwaz(?Nr!r0~b<+b=i^qT1STp&h-H^5;S
zo*$>aI)AQqWG#Ymxe^mQ%Zpidmal$rnm;O7FWP2mxo0FDH8jhlhSLpVqHGk44eyGc
zPvEAfNYS}k3%)Ez+)a3@ejfK#vFc|b0tVIjYpV%=&61lYb$r6m+l5K5YB#|#p&*<N
zUA=sLb-&5wVy^8pU;Mk9ms>u5>?sWozek9L303n*G6^CPFp(X|84kr56F|98JBxZ#
zHELvl6fL5mLCsB^kr73%dXN!2tgI_<Daw47phGdWjv*8G7Aodco}e-cqy#H8lXcJl
zvmMBwP1{@{V3<bFaU)71(e5>!N{$M(M6XRp$0p*@F&{E^6IxhQ!BSJp2xF#CutXwH
zIbMp6p@tO8v~9YC8YxgGdq{gSHWRIPhga2|teMM*9V#-#zK)NG=|EPsEVNDyh`&AE
zJ2CC^!#n}SRiZ0g%`{#Y@0IXsy+=w%KF+Fnf?lt`gv+L~y?R-sBOnxUVX;u9C^+D}
zknBGT=gUuxXGGzrKN)`hNIIBz7>+RC;(q?z_62V3l=wa68UE|y8D6^E!v9!oDKCC{
z$J1Jua5dqC%fEm2Mk5by&{t}!7(O8>xmNhYje8BS%5Q9Th-PcEt$7`YZWA1QyEzgP
zLhnkchWoUjHtJu^iaLGJj&G$9I~H^^SGFRp^134a#A#A_LlAFnE9_Y>Z*Ki?fhX>_
zojpNmXZOCRRQXbQlK5#7bq?!)S<wFfS}OM6Uk~kFzqB6;NKME_e7dFYe|{Jd^(4FI
zRMuQsqJ-f>>y^3Li5Q9@&Q!y;Oy>BF!r_4?1VSi*cI4jK*i2lyBi)uRO5>7ea(-ZR
o6xUx!EmIBKw#I`ePq3{-;WqZFrDd9#H}JmzlYw~a`R*S41#2c>SO5S3

delta 515
zcmZ4Vl<DMkrU{agObiSRj6iI}z_5A(kmdx^hk&%gL`Ua|joVBO^?*=8!N|bCP~X59
zh!l(rtxOH9Ow1J&k~8vilQL6_cvTfV^D;{^6LS<Ya|`l|N;XR|85&PMoy{{j!c=;5
zkEtu`=6hCWL^dxCoFzH=NVe$atn4WM$uIPICSR+{R8R9uttj!yEG|jSOD)p1OLNUj
zDag;vE74Ivk=YzlUBSeIEHpW<UQ7mA0Hhn)u*qU|(UT82vP@oDcb^wUW^+gVVvfnm
zjk=Q!s`xgyb?jrD9NuH2Sk24HndVxSnpdJwW2=x_QDDu>S<A~=lv+|+l&4UXT0EIC
z*?Y3x0*=XNSCmh-OBC8%+q;f&vrE4bGgonDRcd?*XK|JF<l;#=lkEZ(`4w#yvi(E+
z@?8>35?zamCV!u_VDik#s*?{)mSaiHDNddIY_grOR&ruqcu{6as)DUTNl|Gk(8|ev
z8^k9kO)=!oOjFQEtw>HSDAAm}e2Vqvr&IPxAzQRyy&^V?7GGG;s1V{B5#k)~>B`8!
MSjC_Sj8ZfJ0H&a^RR910

diff --git a/GUSI/src/tangled/GUSIContext.cp b/GUSI/src/tangled/GUSIContext.cp
index 2b67d6b..d790e69 100755
--- a/GUSI/src/tangled/GUSIContext.cp
+++ b/GUSI/src/tangled/GUSIContext.cp
@@ -67,7 +67,8 @@ GUSIProcess::~GUSIProcess()
 			now += 300;			// Accelerate
 	}
 }
-// [[GUSIContext::Setup]] initializes the default context.                 
+// [[GUSIContext::Setup]] initializes the default context. We have to employ 
+// [[sCreatingCurrentContext]] to avoid nasty recursions.                  
 //                                                                         
 // <Implementation of completion handling>=                                
 void GUSIContext::Setup(bool threading)
@@ -75,11 +76,13 @@ void GUSIContext::Setup(bool threading)
 	bool	wasThreading = sHasThreading;
 	if (threading)
 		sHasThreading = true;
-	if (!sCurrentContext) {
+	if (!sCurrentContext && !sCreatingCurrentContext) {
 		MaxApplZone();		// It's about time, too!
 		
+		sCreatingCurrentContext = true;
 		sCurrentContext = 
-			new GUSIContext(kApplicationThreadID);
+			GUSIContextFactory::Instance()->CreateContext(kApplicationThreadID);
+		sCreatingCurrentContext = false;
 	} else if (!wasThreading && threading) {
 		// Sometimes we only recognize that we need threading after the application context
   // has already been created. Assuming a disciplined use of threads, we can assume
@@ -97,6 +100,7 @@ void GUSIContext::Setup(bool threading)
 // <Implementation of completion handling>=                                
 GUSIContext::Queue 		GUSIContext::sContexts;
 GUSIContext * 			GUSIContext::sCurrentContext;
+bool					GUSIContext::sCreatingCurrentContext;
 bool					GUSIContext::sHasThreading;
 OSErr					GUSIContext::sError;
 // <Implementation of completion handling>=                                
@@ -187,6 +191,7 @@ GUSIContext::~GUSIContext()
 // <Implementation of completion handling>=                                
 void GUSIContext::Queue::LiquidateAll()
 {
+	GUSIContextFactory::DeleteInstance();
 	GUSIDescriptorTable::CloseAllDescriptors();
 	while (!empty())
 		front()->Liquidate();
@@ -277,19 +282,46 @@ OSErr GUSINewThread(
 	return err;
 }
 // <Implementation of completion handling>=                                
-static auto_ptr<GUSIContextFactory> sGUSIContextFactory;
+#ifdef __MRC__
+#pragma noinline_func GUSISetupContextFactory
+#endif
+#ifdef __MWERKS__
+#pragma dont_inline on
+#endif
+
+void GUSISetupContextFactory()
+{
+}
+
+#ifdef __MWERKS__
+#pragma dont_inline reset
+#endif
+// <Implementation of completion handling>=                                
+static GUSIContextFactory *	sGUSIContextFactory;
+static bool					sGUSIContextFactorySetup;
 
 GUSIContextFactory * GUSIContextFactory::Instance()
 {
-	if (!sGUSIContextFactory.get()) 
+	if (!sGUSIContextFactorySetup) {
+		sGUSIContextFactorySetup = true;
+		GUSISetupContextFactory();
+	}
+
+	if (!sGUSIContextFactory) 
 		SetInstance(new GUSIContextFactory());
 	
-	return sGUSIContextFactory.get();
+	return sGUSIContextFactory;
 }
 
 void GUSIContextFactory::SetInstance(GUSIContextFactory * instance)
 {
-	sGUSIContextFactory = auto_ptr<GUSIContextFactory>(instance);
+	sGUSIContextFactory = instance;
+}
+
+void GUSIContextFactory::DeleteInstance()
+{
+	delete sGUSIContextFactory;
+	sGUSIContextFactory = 0;
 }
 
 GUSIContextFactory::GUSIContextFactory()
diff --git a/GUSI/src/tangled/GUSIDescriptor.cp b/GUSI/src/tangled/GUSIDescriptor.cp
index 2252b23..c61967c 100755
--- a/GUSI/src/tangled/GUSIDescriptor.cp
+++ b/GUSI/src/tangled/GUSIDescriptor.cp
@@ -20,7 +20,7 @@ GUSIDescriptorTable::GUSIDescriptorTable()
 // <Member functions for class [[GUSIDescriptorTable]]>=                   
 #ifdef __MRC__
 #pragma noinline_func GUSISetupConsole, GUSISetupConsoleDescriptors, GUSISetupConsoleStdio
-#pragma noinline_func GUSIStdioClose, GUSIStdioFlush
+#pragma noinline_func GUSIStdioClose, GUSIStdioFlush, GUSISetupDescriptorTable
 #endif
 // <Member functions for class [[GUSIDescriptorTable]]>=                   
 GUSIDescriptorTable	* GUSIDescriptorTable::sGUSIDescriptorTable;
@@ -82,6 +82,24 @@ void GUSISetupConsoleDescriptors()
 		table->InstallSocket(null->open());
 }
 
+#ifdef __MWERKS__
+#pragma dont_inline reset
+#endif
+// If, for any reason, the default descriptor table does not do the job for you, override
+// [[GUSISetupDescriptorTable]].                                           
+//                                                                         
+// <Default implementation of [[GUSISetupDescriptorTable]]>=               
+//
+// Prevent inlining to allow override
+//
+#ifdef __MWERKS__
+#pragma dont_inline on
+#endif
+
+void GUSISetupDescriptorTable()
+{
+}
+
 #ifdef __MWERKS__
 #pragma dont_inline reset
 #endif
@@ -91,11 +109,14 @@ GUSIDescriptorTable * GUSIDescriptorTable::Instance()
 	static bool sNeedConsoleSetup = true;
 	
 	if (!sGUSIDescriptorTable) {
-		sGUSIDescriptorTable = new GUSIDescriptorTable();
-		if (sNeedConsoleSetup) {
-			sNeedConsoleSetup = false;
-			GUSISetupConsole();
-		}
+		GUSISetupDescriptorTable();
+		
+		if (!sGUSIDescriptorTable)
+			sGUSIDescriptorTable = new GUSIDescriptorTable();
+	}
+	if (sNeedConsoleSetup) {
+		sNeedConsoleSetup = false;
+		GUSISetupConsole();
 	}
 	return sGUSIDescriptorTable;
 }
diff --git a/GUSI/src/tangled/GUSIFileSpec.cp b/GUSI/src/tangled/GUSIFileSpec.cp
index c0f2e6a..9f87a61 100755
--- a/GUSI/src/tangled/GUSIFileSpec.cp
+++ b/GUSI/src/tangled/GUSIFileSpec.cp
@@ -460,10 +460,12 @@ OSErr GUSIFileSpec::PrependPathComponent(char *&path, ConstStr63Param component,
 char *	GUSIFileSpec::RelativePath(const FSSpec & dir) const
 {
 	GUSIFileSpec current(dir);
+	if (current.fSpec.name[0])
+		++current;
+	long	relDirID= current.fSpec.parID;
 	if (current.GetVolume(0))
 		return FullPath();
 	short	relVRef = current.fSpec.vRefNum;
-	long	relDirID= dir.parID;
 	current = *this;
 	if (current.GetVolume(0) || current.fSpec.vRefNum != relVRef)
 		return FullPath();
diff --git a/GUSI/src/tangled/GUSIMPW.cp b/GUSI/src/tangled/GUSIMPW.cp
index 196e73a..8b051ee 100755
--- a/GUSI/src/tangled/GUSIMPW.cp
+++ b/GUSI/src/tangled/GUSIMPW.cp
@@ -184,7 +184,8 @@ class GUSIMPWDevice : public GUSIDevice {
 public:
 	static GUSIMPWDevice *	Instance();
 
-	// [[GUSIMPWDevice]] is prepared to handle an [[open]] on a limited set of names.
+	// [[GUSIMPWDevice]] is prepared to handle an [[open]] on a limited set of device names
+ // and on all files.                                                       
  //                                                                         
  // <Overridden member functions for class [[GUSIMPWDevice]]>=              
  virtual bool Want(GUSIFileToken & file);
@@ -285,7 +286,7 @@ bool GUSIMPWDevice::Want(GUSIFileToken & file)
 {
 	switch (file.WhichRequest()) {
 	case GUSIFileToken::kWillOpen:
-		return file.IsDevice() && (file.StrStdStream(file.Path()) > -1);
+		return !file.IsDevice() || (file.StrStdStream(file.Path()) > -1);
 	default:
 		return false;
 	}
@@ -338,6 +339,8 @@ static int TranslateOpenFlags(int mode)
 	return mpwMode;
 }
 // <Member functions for class [[GUSIMPWDevice]]>=                         
+extern int StandAlone;
+
 GUSISocket * GUSIMPWDevice::open(GUSIFileToken & file, int flags)
 {
 	if (!ConnectToMPWLibrary())
@@ -345,16 +348,17 @@ GUSISocket * GUSIMPWDevice::open(GUSIFileToken & file, int flags)
 
 	int fd 	= MPW_open(file.Path(), TranslateOpenFlags(flags));
 	
-	if (fd == -1)
+	if (fd == -1) {
 		return static_cast<GUSISocket *>(nil);
-	else
+	} else if (!file.IsDevice() && !StandAlone && MPW_ioctl(fd, FIOINTERACTIVE, nil) == -1) {
+		MPW_close(fd);
+		return GUSIMacFileDevice::Instance()->open(file, flags);
+	} else
 		return stdopen(fd, flags);
 }
 // [[stdopen]] handles the GUSI side of the opening.                       
 //                                                                         
 // <Member functions for class [[GUSIMPWDevice]]>=                         
-extern int StandAlone;
-
 GUSISocket * GUSIMPWDevice::stdopen(int fd, int flags)
 {
 	if (!ConnectToMPWLibrary())
diff --git a/GUSI/src/tangled/GUSINetDB.cp b/GUSI/src/tangled/GUSINetDB.cp
index 2cd01c4..4fa3e78 100755
--- a/GUSI/src/tangled/GUSINetDB.cp
+++ b/GUSI/src/tangled/GUSINetDB.cp
@@ -380,7 +380,7 @@ void GUSIhostent::Alloc(size_t size)
 {
 	if (size > fAlloc) {
 		if (fName)
-			delete fName;
+			delete[] fName;
 		h_name = fName = new char[fAlloc = size];
 	}
 }
diff --git a/GUSI/src/tangled/GUSIOTInet.cp b/GUSI/src/tangled/GUSIOTInet.cp
index f847658..7f9b94a 100755
--- a/GUSI/src/tangled/GUSIOTInet.cp
+++ b/GUSI/src/tangled/GUSIOTInet.cp
@@ -444,7 +444,7 @@ static int GetInterfaceList(ifconf * conf)
 				if (++interface == maxInterfaces)
 					goto bufferFull;
 			}
-			delete secondaries;
+			delete[] secondaries;
 		}
 		++numInterfaces;
 	}
@@ -472,7 +472,7 @@ static int GetInterfaceParam(ifreq * ifr, unsigned int request)
 		InetHost * secondaries = new InetHost[info.fIPSecondaryCount];
 		OTInetGetSecondaryAddresses(secondaries, &info.fIPSecondaryCount, ifnum);
 		info.fAddress = secondaries[ifalias-1];
-		delete secondaries;
+		delete[] secondaries;
 	}
 	switch (request) {
 	case SIOCGIFADDR:
diff --git a/GUSI/src/tangled/GUSIOTNetDB.cp b/GUSI/src/tangled/GUSIOTNetDB.cp
index c5db7c9..c98d26d 100755
--- a/GUSI/src/tangled/GUSIOTNetDB.cp
+++ b/GUSI/src/tangled/GUSIOTNetDB.cp
@@ -55,6 +55,8 @@ pascal void GUSIOTNetDBNotify(
 	default:
 		if (code != kOTProviderWillClose)
 			result = 0;
+		else 
+			netdb->fCreationContext = nil;	// Close & reopen
 		break;
 	}
 	if (result)
@@ -84,6 +86,10 @@ void GUSIOTNetDB::Instantiate()
 bool GUSIOTNetDB::Resolver()
 {
 	if (!fCreationContext) {
+		if (fSvc) {
+			OTCloseProvider(fSvc);
+			fSvc = nil;
+		}
 		fCreationContext = GUSIContext::Current();
 		if (!GUSIOTFactory::Initialize())
 			return false;
diff --git a/GUSI/src/tangled/GUSIOpenTransport.cp b/GUSI/src/tangled/GUSIOpenTransport.cp
index 6891ec4..5e1090e 100755
--- a/GUSI/src/tangled/GUSIOpenTransport.cp
+++ b/GUSI/src/tangled/GUSIOpenTransport.cp
@@ -111,7 +111,7 @@ void GUSIOTSocket::MopupEvents()
 		
 		delete udErr;
 	}
-	if (fCurEvent & (T_DISCONNECT | T_ORDREL)) {
+	if ((fCurEvent & (T_DISCONNECT | T_ORDREL)) && !(fEvent & T_LISTEN)) {
 		fReadShutdown = true;
 	}
 }
@@ -170,6 +170,7 @@ void GUSIOTSocket::close()
 	
 	Unbind();
 	OTCloseProvider(fEndpoint);
+	fEvent = 0;
 	
 	GUSISocket::close();
 }
@@ -317,6 +318,16 @@ int GUSIOTSocket::ioctl(unsigned int request, va_list arg)
 	return GUSISetPosixError(EOPNOTSUPP);
 }
 // <Member functions for class [[GUSIOTSocket]]>=                          
+bool GUSIOTSocket::pre_select(bool wantRead, bool wantWrite, bool wantExcept)
+{
+	size_t	sz;
+	
+	if (wantRead && OTCountDataBytes(fEndpoint, &sz) == kOTNoDataErr)
+		fEvent &= ~(T_DATA|T_EXDATA);
+	
+	return true;
+}
+// <Member functions for class [[GUSIOTSocket]]>=                          
 int GUSIOTSocket::getsockopt(int level, int optname, void *optval, socklen_t * optlen)
 {
 	int result;
@@ -560,6 +571,7 @@ void GUSIOTStreamSocket::MopupEvents()
 	if (fCurEvent & T_CONNECT) {
 		GUSI_MESSAGE(("Connect\n"));
 		OTRcvConnect(fEndpoint, fPeerName);
+		fEvent |= T_GODATA;
 	}
 	if (fCurEvent & T_ORDREL) {
 		OTRcvOrderlyDisconnect(fEndpoint);
@@ -658,9 +670,9 @@ if (err) {
 		}
 		if (fNextListener) {
 			// <Call [[OTAccept]] and [[return]] if successful>=                       
-   GUSIOTSocket * sock = fNextListener;
+   GUSIOTStreamSocket * sock = fNextListener;
    fCompletion &= ~(CompleteMask(T_ACCEPTCOMPLETE));
-   SetAsyncMacError(OTAccept(fEndpoint, fNextListener->fEndpoint, fNextListener->fPeerName));
+   SetAsyncMacError(OTAccept(fEndpoint, sock->fEndpoint, sock->fPeerName));
    AddContext();
    MopupEvents();
    while (!fAsyncError && !(fCompletion & CompleteMask(T_ACCEPTCOMPLETE))) {
@@ -681,11 +693,13 @@ if (err) {
    	}
    	break;
    case 0:
-   	GUSI_MESSAGE(("GUSIOTStreamSocket::accept accepted %08x\n", fNextListener));
-   	fNextListener = fNextListener->fNextListener;
+   	GUSI_MESSAGE(("GUSIOTStreamSocket::accept accepted %08x\n", sock));
+   	fNextListener 		= sock->fNextListener;
+   	sock->fNextListener = nil;
    	
    	sock->getpeername(address, addrlen);
    	sock->fSockName = new (fEndpoint) GUSIOTTBind;
+   	sock->fEvent |= T_GODATA; /* Ready to write */
    	if (sock->fSockName && !fSockName->Copy(fStrategy, sock->fSockName))
    		return sock;
    	else
@@ -694,7 +708,7 @@ if (err) {
    default:
    deleteCandidate:
    	GUSI_MESSAGE(("GUSIOTStreamSocket::accept async error %d\n", error));
-   	fNextListener = fNextListener->fNextListener;
+   	fNextListener = sock->fNextListener;
    	
    	delete sock;
    }
@@ -772,6 +786,7 @@ ssize_t GUSIOTStreamSocket::recvfrom(
 	if (res == kOTNoDataErr) {
 		if (GUSISetPosixError(GetAsyncError()))
 			return -1;
+		fEvent &= ~(T_DATA|T_EXDATA);
 		if (!fBlocking)
 			return GUSISetPosixError(EWOULDBLOCK);
 		bool signal = false;
@@ -792,9 +807,15 @@ ssize_t GUSIOTStreamSocket::recvfrom(
 		buffer.SetLength(res);
 	if (from)
 		fPeerName->Unpack(fStrategy, from, fromlen);
-	if (exp && (otflags & (T_EXPEDITED|T_MORE)) != T_EXPEDITED) {
+	// When the [[T_EXDATA]] event arrives, we might first get some non-expedited data
+ // [[!(otflags & T_EXPEDITED)]] and then a packet of expedited data [[otflags & T_EXPEDITED]],
+ // possibly with the [[T_MORE]] flag set (although that should not happen in TCP/IP). We 
+ // therefore don't reset [[T_EXDATA]] until we have seen a packet with [[T_EXPEDITED]] set 
+ // and [[T_MORE]] not set.                                                 
+ //                                                                         
+ // <Keep [[T_EXDATA]] flag set until we finish reading expedited data>=    
+ if (exp && (otflags & (T_EXPEDITED|T_MORE)) != T_EXPEDITED) 
 		fEvent |= exp;
-	}
 	return res;
 }
 // <Member functions for class [[GUSIOTStreamSocket]]>=                    
@@ -814,6 +835,7 @@ ssize_t GUSIOTStreamSocket::sendto(
 		OTResult res = OTSnd(fEndpoint, buf, len, 0);
 		if (res <= 0)
 			if (res == kOTFlowErr) {
+				fEvent &= ~T_GODATA;
 				if (!fBlocking)
 					return done ? done : GUSISetPosixError(EWOULDBLOCK);
 				bool signal = GUSIContext::Yield(kGUSIBlock);
@@ -839,32 +861,34 @@ bool GUSIOTStreamSocket::select(bool * canRead, bool * canWrite, bool * except)
 	OTResult	state 	= OTGetEndpointState(fEndpoint);
 	
 	if (canRead) {
-		size_t	sz;
 		if (*canRead = 
 			fReadShutdown										// EOF
 		 || fAsyncError											// Asynchronous error
-		 ||	OTCountDataBytes(fEndpoint, &sz) != kOTNoDataErr	// Data available
+		 ||	fEvent & T_DATA										// Data available
 		 || state == T_INCON									// Connection pending
 		 || fNextListener										// Connection pending
 		) 
 			res = true;
 	}
-	if (canWrite)
-		if (fWriteShutdown || fAsyncError)
+	if (canWrite) {
+		if (fWriteShutdown || fAsyncError) {
 			res = *canWrite = true;
-		else
+		} else {
 			switch (state) {
 			case T_DATAXFER:
 			case T_INREL:
-				*canWrite = true;
-				res   	  = true;
+				if (*canWrite = (fEvent & T_GODATA) != 0)
+					res = true;
 				break;
 			default:
 				*canWrite = false;
 			}
-	if (except)
+		}
+	}
+	if (except) {
 		if (*except = (fEvent & T_EXDATA) != 0)
 			res = true;
+	}
 	return res;
 }	
 // <Member functions for class [[GUSIOTStreamSocket]]>=                    
@@ -1057,8 +1081,7 @@ bool GUSIOTDatagramSocket::select(bool * canRead, bool * canWrite, bool * except
 	OTResult	state 	= OTGetEndpointState(fEndpoint);
 	
 	if (canRead) {
-		size_t	sz;
-		if (*canRead = fAsyncError || OTCountDataBytes(fEndpoint, &sz) != kOTNoDataErr) 
+		if (*canRead = fAsyncError || fEvent & T_DATA) 
 			res = true;
 	}
 	if (canWrite)
diff --git a/lsh/MacOS/src/GUSIPatches.cp b/lsh/MacOS/src/GUSIPatches.cp
index d467878..1ce8c6c 100755
--- a/lsh/MacOS/src/GUSIPatches.cp
+++ b/lsh/MacOS/src/GUSIPatches.cp
@@ -148,12 +148,15 @@ done:
 	return interrupt;
 }
 
+
 /*
  * The fSvc field of the GUSIOTNetDB instance is no longer valid after
  * an interface switch in the TCP/IP control panel.
  * Let's clear it upon kOTProviderWillClose message.
  */
 
+/* no longer needed: GUSI 2.1.6b2 fixes this */
+/*
 // <Asynchronous notifier function for [[GUSIOTNetDB]]>=                   
 inline uint32_t CompleteMask(OTEventCode code)	
 { 	
@@ -199,8 +202,7 @@ pascal void GUSIOTNetDBNotify(
 		netdb->fAsyncError = result;
 	context->Wakeup();
 }
-
-
+*/
 
 
 
diff --git a/macssh/source/ssh/GUSIPatch2.cp b/macssh/source/ssh/GUSIPatch2.cp
index 1e3c724..69c755b 100755
--- a/macssh/source/ssh/GUSIPatch2.cp
+++ b/macssh/source/ssh/GUSIPatch2.cp
@@ -19,6 +19,7 @@
 
 #include <GUSIInternal.h>
 #include <GUSINetDB.h>
+#include <GUSIOTNetDB.h>
 
 #include <pthread.h>
 
@@ -46,3 +47,79 @@ GUSIFileServiceDB * GUSIFileServiceDB::Instance()
 	return static_cast<GUSIFileServiceDB *>(nil);
 }
 
+/*
+ * The fSvc field of the GUSIOTNetDB instance is no longer valid after
+ * an interface switch in the TCP/IP control panel.
+ * Let's clear it upon kOTProviderWillClose message.
+ */
+
+/* no longer needed: GUSI 2.1.6b2 fixes this */
+/*
+// <Asynchronous notifier function for [[GUSIOTNetDB]]>=                   
+inline uint32_t CompleteMask(OTEventCode code)	
+{ 	
+	return 1 << (code & 0x1F); 
+}
+
+pascal void GUSIOTNetDBNotify(
+	GUSIOTNetDB * netdb, OTEventCode code, OTResult result, void *cookie)
+{
+	GUSI_MESSAGE(("GUSIOTNetDBNotify %08x %d\n", code, result));
+	GUSIContext *	context = netdb->fCreationContext;
+	
+	switch (code & 0x7F000000L) {
+	case 0:
+		netdb->fEvent |= code;
+		result = 0;
+		break;
+	case kPRIVATEEVENT:
+	case kCOMPLETEEVENT:
+		if (!(code & 0x00FFFFE0))
+			netdb->fCompletion |= CompleteMask(code);
+		switch (code) {
+		case T_OPENCOMPLETE:
+			netdb->fSvc = static_cast<InetSvcRef>(cookie);
+			break;
+		case T_DNRSTRINGTOADDRCOMPLETE:
+		case T_DNRADDRTONAMECOMPLETE:
+			context = static_cast<GUSIContext **>(cookie)[-1];
+			break;
+		}
+		break;
+	default:
+		if (code != kOTProviderWillClose) {
+			result = 0;
+		} else {
+			netdb->fCreationContext = static_cast<GUSIContext *>(NULL);
+		}
+		break;
+	}
+	if (result)
+		netdb->fAsyncError = result;
+	context->Wakeup();
+}
+
+// <Member functions for class [[GUSIOTNetDB]]>=                           
+bool GUSIOTNetDB::Resolver()
+{
+	if (!fCreationContext) {
+		fCreationContext = GUSIContext::Current();
+		if (!GUSIOTFactory::Initialize())
+			return false;
+		if (fSvc) {
+			OTCloseProvider(fSvc);
+			fSvc = static_cast<InetSvcRef>(NULL);
+		}
+		fAsyncError = 0;
+		OSStatus syncError = OTAsyncOpenInternetServices(
+			kDefaultInternetServicesPath, 
+			0,
+			reinterpret_cast<OTNotifyProcPtr>(GUSIOTNetDBNotify),
+			this);
+		if (!syncError)
+			while (!fAsyncError && !(fCompletion & CompleteMask(T_OPENCOMPLETE)))
+				GUSIContext::Yield(kGUSIBlock);
+	}
+	return fSvc != 0;
+}
+*/
diff --git a/macssh/www/download/ChangeLog b/macssh/www/download/ChangeLog
index 4fd32bd09d8ecc40194e519854febd3374966d7f..c2ca3d0d1d56ffed5b285231e6fe1e86b0a9988f 100755
GIT binary patch
delta 349
zcmbQ2yeD~rs_1<N1_mYu20d8@2IhJoo0EaTaLz<4mB~i@qVkq{yt)dZ1u2OosVNHO
znI#zt?xDe+3PyT{dS*#RdK079ZB}M{qQm)sfq@Z-8RkzG)cZ7<N&l>Lm|Fd$5c{V_
z1`I4faWL5S%!YH@GwXAcU+HVr3*;1MC>R3Gu~aApn-5a54P-kIa06+OHV6;MVE+LT
zV?-AFkEu>^8AJ@I8Ln4xC8jzJ+jdL?HTp0WYTw5+Q2Wv3^9JJl4`6-{_74hSdN%p1
QK{~4%TlC8xlM@YX0VW_m00000

delta 293
zcmdm!JTG~Is^}pG1_mYu20b9fTn8jL85j)fCR(XXoVt3lFTXgW<z_p^XF8ns85kIW
zm|^~8L%sKt9rRcxE9jq*4)uTV)Y$&1kpTk>P!0^XJ$Ue9+k?BeCbJu8>GPKsq$HN4
zrYNN47bzqf8iQ1916ctC+&~(n3&I03*l$lxG!V9Zgejxg2@wM-hpSfX!BnS_HF=|f
sux25qjP@Z+6SR*`erq7k5BFKHe^3b1zRALd>8z@3FGFi4*Bjab0PKi3_5c6?