--- a/Socket.st	Mon Jan 24 15:17:50 2000 +0100
+++ b/Socket.st	Mon Jan 24 16:04:07 2000 +0100
@@ -3126,6 +3126,9 @@
 	DBGFPRINTF((stderr, "socket fclose %x (%d)\n", fp, fileno(fp)));
 	fflush(fp);
 	/* shutdown(fileno(fp), 2); */
+	if (@global(ExternalStream:FileOpenTrace) == true) {
+	    fprintf(stderr, "fclose [Socket] %x\n", fp);
+	}
 	fclose(fp);
 	__INST(filePointer) = nil;
     }
@@ -3198,6 +3201,9 @@
 	__BEGIN_INTERRUPTABLE__
 	shutdown(fd, 2);
 	DBGFPRINTF((stderr, "socket fclose %x (%d)\n", fp, fd));
+	if (@global(ExternalStream:FileOpenTrace) == true) {
+	    fprintf(stderr, "fclose [Socket] %x\n", f);
+	}
 	fclose(f);
 	/* close(fd); */
 	__END_INTERRUPTABLE__
@@ -3276,26 +3282,26 @@
 
     sock = _intVal(serverSocketFd);
 
-#if defined(O_NDELAY) && defined(SET_NDELAY)
+# if defined(O_NDELAY) && defined(SET_NDELAY)
     flags = ioctl(sock, F_GETFL, 0);
     ioctl(sock, F_SETFL, flags | O_NDELAY);
-#endif
-
-#ifdef AF_INET
+# endif
+
+# ifdef AF_INET
     if (__INST(domain) == @symbol(inet)) {
 	alen0 = sizeof(sa.in);
     }
-#endif
-#ifdef AF_INET6
+# endif
+# ifdef AF_INET6
     if (__INST(domain) == @symbol(inet6)) {
 	alen0 = sizeof(sa.in6);
     }
-#endif
-#ifdef AF_UNIX
+# endif
+# ifdef AF_UNIX
     if (__INST(domain) == @symbol(unix)) {
 	alen0 = sizeof(sa.un);
     }
-#endif
+# endif
 # ifdef AF_APPLETALK
     if (__INST(domain) == @symbol(appletalk)) {
 	alen0 = sizeof(sa.at);
@@ -3376,9 +3382,9 @@
     __END_INTERRUPTABLE__
     DBGFPRINTF((stderr, "socket accept newSock=%d\n", newSock));
 
-#if defined(O_NDELAY) && defined(SET_NDELAY)
+# if defined(O_NDELAY) && defined(SET_NDELAY)
     ioctl(sock, F_SETFL, flags);
-#endif
+# endif
 
     if (newSock < 0) {
 	DBGPRINTF(("SOCKET: accept call failed errno=%d\n", errno));
@@ -3389,7 +3395,7 @@
     /*
      * extract the partners address
      */
-#ifdef AF_INET
+# ifdef AF_INET
     if (__INST(domain) == @symbol(inet)) {
 	GETHOSTBYADDR(he, (char *) &sa.in.sin_addr, sizeof(sa.in.sin_addr), AF_INET);
 	if (! he) {
@@ -3406,9 +3412,9 @@
 	__INST(peerName) = __MKSTRING((he ? he->h_name : dotted));
 	__STORESELF(peerName);
     }
-#endif
-
-#ifdef AF_INET6
+# endif
+
+# ifdef AF_INET6
     if (__INST(domain) == @symbol(inet6)) {
 	GETHOSTBYADDR(he, (char *) &sa.in6.sin6_addr, sizeof(sa.in6.sin6_addr), AF_INET6);
 	if (! he) {
@@ -3430,16 +3436,16 @@
 	__INST(peerName) = __MKSTRING((he ? he->h_name : dotted));
 	__STORESELF(peerName);
     }
-#endif
-
-#ifdef AF_UNIX
+# endif
+
+# ifdef AF_UNIX
     if (__INST(domain) == @symbol(unix)) {
 	DBGPRINTF(("SOCKET: accepted connection on unix socket\n")) ;
 	/* nothing to be done here */
     }
-#endif
-
-#ifdef AF_APPLETALK
+# endif
+
+# ifdef AF_APPLETALK
     if (__INST(domain) == @symbol(appletalk)) {
 	GETHOSTBYADDR(he, (char *) &sa.at.sat_addr, sizeof(sa.at.sat_addr), AF_APPLETALK);
 	if (! he) {
@@ -3530,15 +3536,19 @@
 	close(newSock);
 	DBGFPRINTF((stderr, "socket close (fdopen failed) (%d)\n", newSock));
 	RETURN (false);
-    } else {
-#ifdef BUGGY_STDIO_LIB
-	setbuf(fp, NULL);
-	__INST(buffered) = false;
-#endif
-	__INST(filePointer) = __MKOBJ(fp);
-	__STORESELF(filePointer);
+    }
+    if (@global(ExternalStream:FileOpenTrace) == true) {
+	fprintf(stderr, "fdopen [Socket] -> %x\n", fp);
     }
-#endif
+
+# ifdef BUGGY_STDIO_LIB
+    setbuf(fp, NULL);
+    __INST(buffered) = false;
+# endif
+
+    __INST(filePointer) = __MKOBJ(fp);
+    __STORESELF(filePointer);
+#endif /* not NO_SOCKET */
 %}.
     mode := #readwrite.
     Lobby register:self.
@@ -4369,6 +4379,10 @@
 	    DBGFPRINTF((stderr, "socket close (fdopen failed) (%d)\n", sock));
 	    __END_INTERRUPTABLE__
 	} else {
+            if (@global(ExternalStream:FileOpenTrace) == true) {
+                fprintf(stderr, "fdopen [Socket] -> %x\n", fp);
+            }
+
 	    __INST(filePointer) = __MKOBJ(fp);
 	    __STORESELF(filePointer);
 	}
@@ -4503,6 +4517,10 @@
 		DBGFPRINTF((stderr, "socket close (fdopen failed) (%d)\n", sock));
 		__END_INTERRUPTABLE__
 	    } else {
+                if (@global(ExternalStream:FileOpenTrace) == true) {
+                    fprintf(stderr, "fdopen [Socket] -> %x\n", fp);
+                }
+
 #ifdef BUGGY_STDIO_LIB
 		setbuf(fp, NULL);
 		__INST(buffered) = false;
@@ -4637,6 +4655,10 @@
 		DBGFPRINTF((stderr, "socket close (fdopen failed) (%d)\n", sock));
 		__END_INTERRUPTABLE__
 	    } else {
+                if (@global(ExternalStream:FileOpenTrace) == true) {
+                    fprintf(stderr, "fdopen [Socket] -> %x\n", fp);
+                }
+
 #ifdef BUGGY_STDIO_LIB
 		setbuf(fp, NULL);
 		__INST(buffered) = false;
@@ -4727,5 +4749,5 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.144 2000-01-24 14:17:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.145 2000-01-24 15:04:07 cg Exp $'
 ! !