[inseparable changes from match from perl-5.003_93 to perl-5.003_94]

 BUILD PROCESS

Subject: Don't use db 2.x, we're not yet ready for it
From: Paul Marquess <pmarquess@bfsec.bt.co.uk>
Files: Configure

Subject: Warn if #! command is longer than 32 chars
From: Chip Salzenberg <chip@perl.com>
Files: Configure

Subject: patches re perl -wc install{perl,man}
Date: Tue, 11 Mar 97 13:13:16 GMT
From: Robin Barker <rmb1@cise.npl.co.uk>
Files: installman installperl

    I got the new installhtml from CPAN
    (TOMC/scripts/pod2html-v2.0beta.shar.gz)
    
    I had problems getting the system call to splitpod at line 376 to work.
    
    1. splitroot was not being found
    2. splitroot was not finding its library
    3. I changed htmlroot to podroot at line 175 to match the documentation.
    
    p5p-msgid: 3180.9703270906@tempest.cise.npl.co.uk
    private-msgid: 21544.9703111313@tempest.cise.npl.co.uk

Subject: 3_93 doesn't install pods
Date: Sun, 16 Mar 1997 02:21:35 -0500
From: Spider Boardman <spider@orb.nashua.nh.us>
Files: installperl
Msg-ID: 199703160721.CAA08339@Orb.Nashua.NH.US

    (applied based on p5p patch as commit 43506a616735d616e03d277d64fbae1e864024bf)

Subject: When installing, use File::Copy instead of `cp`
From: Chip Salzenberg <chip@perl.com>
Files: installperl

Subject: Make hint files' warnings more visible
Date: Thu, 20 Mar 1997 23:18:03 +0100 (MET)
From: Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
Files: hints/3b1.sh hints/apollo.sh hints/cxux.sh hints/dcosx.sh hints/dgux.sh hints/esix4.sh hints/freebsd.sh hints/hpux.sh hints/irix_4.sh hints/mips.sh hints/next_3_0.sh hints/os2.sh hints/qnx.sh hints/sco_2_3_3.sh hints/sco_2_3_4.sh hints/solaris_2.sh hints/ultrix_4.sh hints/utekv.sh

    private-msgid: 199703202218.XAA09041@bombur2.uio.no

 CORE LANGUAGE CHANGES

Subject: Defer creation of array and hash elements as parameters
From: Chip Salzenberg <chip@perl.com>
Files: dump.c global.sym mg.c op.c op.h perl.h pp.c pp_hot.c proto.h sv.c

Subject: New special literal: __PACKAGE__
From: Chip Salzenberg <chip@perl.com>
Files: keywords.pl pod/perldata.pod toke.c

Subject: Abort compilation at C<BEGIN{}> or C<use> after errors
From: Chip Salzenberg <chip@perl.com>
Files: op.c pod/perldiag.pod t/pragma/subs.t

Subject: allow C<substr 'hello', -10>
Date: Mon, 10 Mar 1997 15:55:44 -0800
From: David Dyck <dcd@tc.fluke.com>
Files: pp.c
Msg-ID: 97Mar10.155517pst.35716-2@gateway.fluke.com

    (applied based on p5p patch as commit 77f720bf92f3d0100352416caeedd57936807ff2)

Subject: Regularize C<x % y>, esp. when y is negative
From: Chip Salzenberg <chip@perl.com>
Files: pp.c

Subject: Flush before C<flock(FOO, LOCK_UN)>
From: Chip Salzenberg <chip@perl.com>
Files: pod/perldelta.pod pod/perlfunc.pod pp_sys.c

Subject: Close loopholes in prototype mismatch warning
From: Chip Salzenberg <chip@perl.com>
Files: op.c sv.c toke.c

Subject: Warn on C<while ($x = each %y) {}>
From: Chip Salzenberg <chip@perl.com>
Files: op.c pod/perldiag.pod

Subject: Don't warn on C<print $fh func()>
From: Chip Salzenberg <chip@perl.com>
Files: toke.c

 CORE PORTABILITY

Subject: Don't say 'static var = 1'
Date: Sun, 9 Mar 1997 15:19:57 +0200 (EET)
From: Jarkko Hietaniemi <jhi@iki.fi>
Files: malloc.c

    private-msgid: 199703091319.PAA24714@alpha.hut.fi

Subject: HP/UX hint comments
Date: Fri, 21 Mar 1997 15:43:07 -0500 (EST)
From: Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Files: hints/hpux.sh

    private-msgid: Pine.SOL.3.95q.970321153918.28770B-100000@fractal.lafayette.

Subject: VMS update
Date: Tue, 11 Mar 1997 22:00:55 -0500 (EST)
From: Charles Bailey <bailey@hmivax.humgen.upenn.edu>
Files: lib/ExtUtils/MM_VMS.pm lib/Test/Harness.pm t/op/taint.t utils/perlbug.PL vms/descrip.mms
Msg-ID: 1997Mar11.220056.1873182@hmivax.humgen.upenn.edu

    (applied based on p5p patch as commit 2b5725676da60b49978f38b85bb7f8ee20b4cb55)

Subject: vmsish.t and related patches
Date: Fri, 21 Mar 1997 01:32:47 -0500 (EST)
From: Charles Bailey <bailey@HMIVAX.HUMGEN.UPENN.EDU>
Files: MANIFEST perl.h vms/descrip.mms vms/ext/vmsish.t vms/vms.c

    private-msgid: 01IGQW3IP1KK005VFB@hmivax.humgen.upenn.edu

Subject: Win32 update (four patches)
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: MANIFEST README.win32 lib/AutoSplit.pm lib/Cwd.pm lib/ExtUtils/Command.pm lib/ExtUtils/Install.pm lib/ExtUtils/MM_OS2.pm lib/ExtUtils/MM_Unix.pm lib/ExtUtils/MM_Win32.pm lib/ExtUtils/MakeMaker.pm lib/ExtUtils/Mksymlists.pm lib/File/Basename.pm lib/File/Path.pm mg.c t/comp/cpp.t t/comp/script.t t/harness t/io/argv.t t/io/dup.t t/io/fs.t t/io/inplace.t t/lib/filehand.t t/lib/io_dup.t t/lib/io_sel.t t/lib/io_taint.t t/op/closure.t t/op/exec.t t/op/glob.t t/op/goto.t t/op/magic.t t/op/misc.t t/op/rand.t t/op/split.t t/op/stat.t t/op/sysio.t t/op/taint.t t/pragma/strict.t t/pragma/subs.t t/pragma/warning.t util.c win32/*

 DOCUMENTATION

Subject: perlfaq.pod
Date: Mon, 17 Mar 1997 16:01:40 -0700
From: Tom Christiansen <tchrist@jhereg.perl.com>
Files: MANIFEST pod/Makefile pod/buildtoc pod/perl.pod pod/perlfaq*.pod pod/roffitall

    private-msgid: 199703172301.QAA12566@jhereg.perl.com

Subject: *.pod changes based on the FAQ
Date: Mon, 17 Mar 1997 09:50:14 -0700 (MST)
From: Nat Torkington <gnat@frii.com>
Files: pod/perldata.pod pod/perlfunc.pod pod/perlipc.pod pod/perlop.pod pod/perlre.pod pod/perlrun.pod pod/perlsec.pod pod/perlvar.pod
Msg-ID: 199703171650.JAA02655@elara.frii.com

    (applied based on p5p patch as commit 3c10ad8e31f7d77e71c048b1746912f41cb540f0)

Subject: Document that $. is not reset on implicit open
From: Chip Salzenberg <chip@perl.com>
Files: pod/perldelta.pod

Subject: Re: Embedding success with _93 
Date: Tue, 11 Mar 1997 17:55:05 -0500
From: Doug MacEachern <dougm@opengroup.org>
Files: pod/perldelta.pod
Msg-ID: 199703112255.RAA22775@postman.osf.org

    (applied based on p5p patch as commit 63a6ff3a1dc8d86edb4d8a7ec1548205e32a7114)

Subject: Patch to document illegal characters
Date: Fri, 14 Mar 1997 09:08:10 -0800 (PST)
From: Tom Phoenix <rootbeer@teleport.com>
Files: pod/perldiag.pod pod/perltrap.pod

    private-msgid: Pine.GSO.3.96.970314090558.15346J-100000@kelly.teleport.com

Subject: Document trap with //o and closures
Date: Mon, 10 Mar 1997 18:08:08 -0500 (EST)
From: Charles Bailey <bailey@HMIVAX.HUMGEN.UPENN.EDU>
Files: pod/perltrap.pod
Msg-ID: 01IGCHWRNSEU00661G@hmivax.humgen.upenn.edu

    (applied based on p5p patch as commit a54cb1465fdb400848f23705a6f130bb5c34ab70)

Subject: Illegal character in input
Date: Mon, 10 Mar 1997 15:21:21 -0800 (PST)
From: Tom Phoenix <rootbeer@teleport.com>
Files: pod/perldiag.pod

    private-msgid: Pine.GSO.3.95q.970310151512.22489a-100000@kelly.teleport.com

Subject: Patch for docs Re: Lost backslash
Date: Wed, 19 Mar 1997 07:28:57 -0800 (PST)
From: Tom Phoenix <rootbeer@teleport.com>
Files: pod/perlop.pod

    private-msgid: Pine.GSO.3.96.970319071438.24834G-100000@kelly.teleport.com

Subject: XSUB's doc fix
Date: Mon, 10 Mar 1997 11:42:06 -0500
From: Roderick Schertler <roderick@argon.org>
Files: pod/perlcall.pod pod/perlguts.pod pod/perlxstut.pod
Msg-ID: 28804.858012126@eeyore.ibcinc.com

    (applied based on p5p patch as commit 5f43237038ea7a4151d3bf65aeeecd56ceb78a6a)

Subject: Document return from do FILE
Date: Tue, 18 Mar 1997 14:50:10 +0000
From: "M.J.T. Guy" <mjtg@cus.cam.ac.uk>
Files: pod/perlfunc.pod
Msg-ID: E0w70DK-0001yJ-00@ursa.cus.cam.ac.uk

    (applied based on p5p patch as commit ba8d5fb439878113de8abc9b52d2af237d30fb3c)

Subject: Document $^M in perlvar
Date: Thu, 20 Mar 97 21:08:33 GMT
From: Robin Barker <rmb1@cise.npl.co.uk>
Files: pod/perlvar.pod

    private-msgid: 6153.9703202108@tempest.cise.npl.co.uk

Subject: typos in pods of 5.003_93
Date: 19 Mar 1997 10:39:38 -0600
From: Jim Meyering <meyering@asic.sc.ti.com>
Files: pod/perlfunc.pod pod/perlguts.pod pod/perlre.pod pod/perltoot.pod pod/perlxs.pod
Msg-ID: wpgendbzvhx.fsf@asic.sc.ti.com

    (applied based on p5p patch as commit 76a9873e006cf8f48f57062b2a0dd40b5ed45a95)

Subject: Re: Updates to pod punctuations
Date: Fri, 14 Mar 1997 17:00:12 -0500
From: Larry W. Virden <lvirden@cas.org>
Files: pod/*.pod

    private-msgid: 9703141700.AA22911@cas.org

Subject: clarify example in perlfunc
Date: Thu, 20 Mar 1997 19:46:01 +0200 (EET)
From: Jarkko Hietaniemi <jhi@iki.fi>
Files: pod/perlfunc.pod

    private-msgid: 199703201746.TAA25195@alpha.hut.fi

Subject: Regularize headings in DB_File documentation
From: Chip Salzenberg <chip@perl.com>
Files: ext/DB_File/DB_File.pm

 LIBRARY AND EXTENSIONS

Subject: New module: autouse.pm
Date: Thu, 20 Mar 1997 19:34:30 -0500 (EST)
From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Files: MANIFEST lib/autouse.pm
Msg-ID: 199703210034.TAA13469@monk.mps.ohio-state.edu

    (applied based on p5p patch as commit 6757905eccb6dd0440ef65e8128a277a20f7d943)

Subject: Refresh DB_File to 1.12
Date: Wed, 12 Mar 97 15:51:14 GMT
From: Paul Marquess <pmarquess@bfsec.bt.co.uk>
Files: ext/DB_File/DB_File.pm ext/DB_File/DB_File.xs
Msg-ID: 9703121551.AA07435@claudius.bfsec.bt.co.uk

    (applied based on p5p patch as commit b3deed9189f963e9994815307931f9084f60d1d9)

Subject: In File::Path, some systems can't remove read-only files
From: Chip Salzenberg <chip@perl.com>
Files: lib/File/Path.pm

Subject: Fix bugs revealed by prototype warnings
From: Chip Salzenberg <chip@perl.com>
Files: ext/Opcode/Opcode.pm lib/ExtUtils/MakeMaker.pm lib/Getopt/Long.pm

Subject: Problems with SKIP in makemaker
Date: Thu, 20 Mar 1997 23:13:31 -0500 (EST)
From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Files: lib/ExtUtils/MM_Unix.pm
Msg-ID: 199703210413.XAA21601@monk.mps.ohio-state.edu

    (applied based on p5p patch as commit 970322a2e8024294ada6e8d1a027cb98f1f48ee3)

Subject: In Exporter, don't C<require Carp> at file scope
From: Chip Salzenberg <chip@perl.com>
Files: lib/Exporter.pm

Subject: fix for Exporter's $SIG{__WARN__} handler
Date: Thu, 13 Mar 1997 18:40:51 -0500
From: Roderick Schertler <roderick@argon.org>
Files: lib/Exporter.pm
Msg-ID: 2282.858296451@eeyore.ibcinc.com

    (applied based on p5p patch as commit 2768ea1aeef34f42d096f198fbe629c8374ca429)

Subject: Don't try to substr() refs in Carp
From: Chip Salzenberg <chip@perl.com>
Files: lib/Carp.pm

Subject: Re: NUL in die and other messages
Date: Fri, 21 Mar 1997 09:58:17 +0000
From: "M.J.T. Guy" <mjtg@cus.cam.ac.uk>
Files: lib/Carp.pm
Msg-ID: E0w815V-0005xs-00@ursa.cus.cam.ac.uk

    (applied based on p5p patch as commit 52a267c574cb66c4bc35601dcf148a1d7a3bc557)

 OTHER CORE CHANGES

Subject: Guard against buffer overflow in yyerror() and related funcs
From: Chip Salzenberg <chip@perl.com>
Files: toke.c

Subject: For bin compat, rename calllist() and he_{,delay}free
From: Chip Salzenberg <chip@perl.com>
Files: global.sym hv.c op.c perl.c pod/perlguts.pod proto.h

Subject: Fix C<print> on tied default handle
From: Chip Salzenberg <chip@perl.com>
Files: pp_hot.c

Subject: Fix C<local($a, undef, $b) = (1,2,3)>
From: Chip Salzenberg <chip@perl.com>
Files: op.c

Subject: Improve diagnostic on C<@a++>, C<--%a>, @a =~ s/a/b/
From: Chip Salzenberg <chip@perl.com>
Files: pp.c pp_hot.c

Subject: Don't warn on C<$x{y} .= "z"> when %x is tied
From: Chip Salzenberg <chip@perl.com>
Files: pp_hot.c

Subject: Eliminate 'unreachable code' warnings
From: Chip Salzenberg <chip@perl.com>
Files: ext/POSIX/POSIX.xs mg.c pp_ctl.c toke.c

Subject: printf format corrections for -DDEBUGGING
Date: Wed, 19 Mar 1997 12:42:50 -0500
From: Roderick Schertler <roderick@argon.org>
Files: doop.c malloc.c op.c pp_ctl.c regexec.c sv.c x2p/str.c x2p/util.c
Msg-ID: 26592.858793370@eeyore.ibcinc.com

    (applied based on p5p patch as commit e125f273e351a19a92b69d6244af55abbbf0a26d)

Subject: Warn about missing -DMULTIPLICITY if likely a problem
Date: Wed, 19 Mar 1997 18:45:53 -0500
From: Doug MacEachern <dougm@opengroup.org>
Files: perl.c
Msg-ID: 199703192345.SAA15070@postman.osf.org

    (applied based on p5p patch as commit 71aeea1753924e6e19c2461e241e3f7d8a570e90)

1 files changed, 456 insertions, 408 deletions

diff --git a/win32/win32sck.c b/win32/win32sck.c
index 126ff1a246..7acb02871c 100644
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -1,11 +1,12 @@
-// NTSock.C
-
-// (c) 1995 Microsoft Corporation. All rights reserved. 
-// 		Developed by hip communications inc., http://info.hip.com/info/
-// Portions (c) 1993 Intergraph Corporation. All rights reserved.
-
-//    You may distribute under the terms of either the GNU General Public
-//    License or the Artistic License, as specified in the README file.
+/* NTSock.C
+ *
+ * (c) 1995 Microsoft Corporation. All rights reserved. 
+ * 		Developed by hip communications inc., http://info.hip.com/info/
+ * Portions (c) 1993 Intergraph Corporation. All rights reserved.
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ */
 
 #include <windows.h>
 #define WIN32_LEAN_AND_MEAN
@@ -19,10 +20,10 @@
 #define CROAK croak
 
 #ifdef USE_SOCKETS_AS_HANDLES
-// thanks to Beverly Brown	(beverly@datacube.com)
+/* thanks to Beverly Brown	(beverly@datacube.com) */
 
 #	if defined(_WIN32) && !defined(WIN95_OSFHANDLE_FIXED) && defined(_M_IX86)
-//#		define OPEN_SOCKET(x)	_patch_open_osfhandle(x, _O_RDWR | _O_BINARY)
+/*#		define OPEN_SOCKET(x)	_patch_open_osfhandle(x, _O_RDWR | _O_BINARY) */
 #		define OPEN_SOCKET(x)	_open_osfhandle(x,_O_RDWR|_O_BINARY)
 #	else
 #		define OPEN_SOCKET(x)	_open_osfhandle(x,_O_RDWR|_O_BINARY)
@@ -34,17 +35,18 @@
 #	define OPEN_SOCKET(x)	(x)
 #	define TO_SOCKET(x)	(x)
 
-#endif	// USE_SOCKETS_AS_HANDLES
+#endif	/* USE_SOCKETS_AS_HANDLES */
 
-//
-// This is a clone of fdopen so that we can handle the version of sockets that NT gets to use.
-//
-// The problem is that sockets are not real file handles and 
-// cannot be fdopen'ed. This causes problems in the do_socket
-// routine in doio.c, since it tries to create two file pointers
-// for the socket just created. We'll fake out an fdopen and see
-// if we can prevent perl from trying to do stdio on sockets.
-//
+/*
+ * This is a clone of fdopen so that we can handle the version of
+ * sockets that NT gets to use.
+ *
+ * The problem is that sockets are not real file handles and 
+ * cannot be fdopen'ed. This causes problems in the do_socket
+ * routine in doio.c, since it tries to create two file pointers
+ * for the socket just created. We'll fake out an fdopen and see
+ * if we can prevent perl from trying to do stdio on sockets.
+ */
 
 #if defined(_WIN32) && !defined(WIN95_OSFHANDLE_FIXED) && defined(_M_IX86)
 
@@ -59,38 +61,38 @@ EXT_C_FUNC int __cdecl _set_osfhnd(int fh, long value);
 EXT_C_FUNC void __cdecl _lock_fhandle(int);
 EXT_C_FUNC void __cdecl _unlock_fhandle(int);
 EXT_C_FUNC void __cdecl _unlock(int);
-EXT_C_FUNC struct servent* win32_savecopyservent(struct servent*d, struct servent*s, const char *proto);
+EXT_C_FUNC struct servent* win32_savecopyservent(struct servent*d, 
+						 struct servent*s, const char *proto);
 
 #if	(_MSC_VER >= 1000)
-	typedef struct
-	{
-		long osfhnd;    /* underlying OS file HANDLE */
-		char osfile;    /* attributes of file (e.g., open in text mode?) */
-		char pipech;    /* one char buffer for handles opened on pipes */
+typedef struct 	{
+    long osfhnd;    /* underlying OS file HANDLE */
+    char osfile;    /* attributes of file (e.g., open in text mode?) */
+    char pipech;    /* one char buffer for handles opened on pipes */
 #if defined (_MT) && !defined (DLL_FOR_WIN32S)
-        int lockinitflag;
-        CRITICAL_SECTION lock;
+    int lockinitflag;
+    CRITICAL_SECTION lock;
 #endif  /* defined (_MT) && !defined (DLL_FOR_WIN32S) */
-	}	ioinfo;
+}	ioinfo;
 
-	EXT_C_FUNC ioinfo * __pioinfo[];
+EXT_C_FUNC ioinfo * __pioinfo[];
 
-	#define IOINFO_L2E			5
-	#define IOINFO_ARRAY_ELTS	(1 << IOINFO_L2E)
-	#define _pioinfo(i)	(__pioinfo[i >> IOINFO_L2E] + (i & (IOINFO_ARRAY_ELTS - 1)))
-	#define _osfile(i)	(_pioinfo(i)->osfile)
-#else
-	extern "C" extern char _osfile[];
-#endif	// (_MSC_VER >= 1000)
+#define IOINFO_L2E			5
+#define IOINFO_ARRAY_ELTS	(1 << IOINFO_L2E)
+#define _pioinfo(i)	(__pioinfo[i >> IOINFO_L2E] + (i & (IOINFO_ARRAY_ELTS - 1)))
+#define _osfile(i)	(_pioinfo(i)->osfile)
+#else	/* (_MSC_VER >= 1000) */
+	extern char _osfile[];
+#endif	/* (_MSC_VER >= 1000) */
 
-#define FOPEN			0x01	// file handle open
-#define FAPPEND			0x20	// file handle opened O_APPEND
-#define FDEV			0x40	// file handle refers to device
-#define FTEXT			0x80	// file handle is in text mode
+#define FOPEN			0x01	/* file handle open */
+#define FAPPEND			0x20	/* file handle opened O_APPEND */
+#define FDEV			0x40	/* file handle refers to device */
+#define FTEXT			0x80	/* file handle is in text mode */
 
-#define _STREAM_LOCKS   26		// Table of stream locks
-#define _LAST_STREAM_LOCK  (_STREAM_LOCKS+_NSTREAM_-1)	// Last stream lock
-#define _FH_LOCKS          (_LAST_STREAM_LOCK+1)		// Table of fh locks
+#define _STREAM_LOCKS   26		/* Table of stream locks */
+#define _LAST_STREAM_LOCK  (_STREAM_LOCKS+_NSTREAM_-1)	/* Last stream lock */
+#define _FH_LOCKS          (_LAST_STREAM_LOCK+1)	/* Table of fh locks */
 
 /***
 *int _patch_open_osfhandle(long osfhandle, int flags) - open C Runtime file handle
@@ -98,8 +100,8 @@ EXT_C_FUNC struct servent* win32_savecopyservent(struct servent*d, struct serven
 *Purpose:
 *       This function allocates a free C Runtime file handle and associates
 *       it with the Win32 HANDLE specified by the first parameter. This is a
-*		temperary fix for WIN95's brain damage GetFileType() error on socket
-*		we just bypass that call for socket
+*	temperary fix for WIN95's brain damage GetFileType() error on socket
+*	we just bypass that call for socket
 *
 *Entry:
 *       long osfhandle - Win32 HANDLE to associate with C Runtime file handle.
@@ -113,45 +115,44 @@ EXT_C_FUNC struct servent* win32_savecopyservent(struct servent*d, struct serven
 *
 *******************************************************************************/
 
-int __cdecl _patch_open_osfhandle(long osfhandle, int flags)
+int __cdecl
+_patch_open_osfhandle(long osfhandle, int flags)
 {
-	int fh;
-	char fileflags;		// _osfile flags 
+    int fh;
+    char fileflags;		/* _osfile flags */
 
-	// copy relevant flags from second parameter 
-	fileflags = FDEV;
+    /* copy relevant flags from second parameter */
+    fileflags = FDEV;
 
-	if(flags & _O_APPEND)
-		fileflags |= FAPPEND;
+    if(flags & _O_APPEND)
+	fileflags |= FAPPEND;
 
-	if(flags & _O_TEXT)
-		fileflags |= FTEXT;
+    if(flags & _O_TEXT)
+	fileflags |= FTEXT;
 
-	// attempt to allocate a C Runtime file handle
-	if((fh = _alloc_osfhnd()) == -1)
-	{
-		errno = EMFILE;		// too many open files 
-		_doserrno = 0L;		// not an OS error
-		return -1;			// return error to caller
-	}
+    /* attempt to allocate a C Runtime file handle */
+    if((fh = _alloc_osfhnd()) == -1) {
+	errno = EMFILE;		/* too many open files */
+	_doserrno = 0L;		/* not an OS error */
+	return -1;		/* return error to caller */
+    }
 
-	// the file is open. now, set the info in _osfhnd array
-	_set_osfhnd(fh, osfhandle);
+    /* the file is open. now, set the info in _osfhnd array */
+    _set_osfhnd(fh, osfhandle);
 
-	fileflags |= FOPEN;			// mark as open
+    fileflags |= FOPEN;		/* mark as open */
 
 #if (_MSC_VER >= 1000)
-	_osfile(fh) = fileflags;	// set osfile entry
-	_unlock_fhandle(fh);
+    _osfile(fh) = fileflags;	/* set osfile entry */
+    _unlock_fhandle(fh);
 #else
-	_osfile[fh] = fileflags;	// set osfile entry
-	_unlock(fh+_FH_LOCKS);		// unlock handle
+    _osfile[fh] = fileflags;	/* set osfile entry */
+    _unlock(fh+_FH_LOCKS);		/* unlock handle */
 #endif
 
-
-	return fh;					// return handle
+    return fh;			/* return handle */
 }
-#endif	// _M_IX86
+#endif	/* _M_IX86 */
 
 #define SOCKETAPI PASCAL 
 
@@ -196,7 +197,7 @@ typedef int (SOCKETAPI *LPSOCKWSAGETLASTERROR)(void);
 typedef int (SOCKETAPI *LPWSAFDIsSet)(SOCKET, fd_set *);
 
 static HINSTANCE hWinSockDll = 0;
-// extern CRITICAL_SECTION csSock;
+/* extern CRITICAL_SECTION csSock; */
 
 static LPSOCKACCEPT paccept = 0;
 static LPSOCKBIND pbind = 0;
@@ -236,526 +237,573 @@ static LPSOCKINETADDR pinet_addr = 0;
 __declspec(thread) struct servent myservent;
 
 
-void *GetAddress(HINSTANCE hInstance, char *lpFunctionName)
-{
-	char buffer[512];
-	FARPROC proc = GetProcAddress(hInstance, lpFunctionName);
-	if(proc == 0)
-	{
-		sprintf(buffer, "Unable to get address of %s in WSock32.dll", lpFunctionName);
-		CROAK(buffer);
-	}
-	return proc;
-}
-
-void LoadWinSock(void)
-{
-//	EnterCriticalSection(&csSock);
-	if(hWinSockDll == NULL)
-	{
-		HINSTANCE hLib = LoadLibrary("WSock32.DLL");
-		if(hLib == NULL)
-			CROAK("Could not load WSock32.dll\n");
-
-		paccept = (LPSOCKACCEPT)GetAddress(hLib, "accept");
-		pbind = (LPSOCKBIND)GetAddress(hLib, "bind");
-		pclosesocket = (LPSOCKCLOSESOCKET)GetAddress(hLib, "closesocket");
-		pconnect = (LPSOCKCONNECT)GetAddress(hLib, "connect");
-		pioctlsocket = (LPSOCKIOCTLSOCKET)GetAddress(hLib, "ioctlsocket");
-		pgetpeername = (LPSOCKGETPEERNAME)GetAddress(hLib, "getpeername");
-		pgetsockname = (LPSOCKGETSOCKNAME)GetAddress(hLib, "getsockname");
-		pgetsockopt = (LPSOCKGETSOCKOPT)GetAddress(hLib, "getsockopt");
-		phtonl = (LPSOCKHTONL)GetAddress(hLib, "htonl");
-		phtons = (LPSOCKHTONS)GetAddress(hLib, "htons");
-		plisten = (LPSOCKLISTEN)GetAddress(hLib, "listen");
-		pntohl = (LPSOCKNTOHL)GetAddress(hLib, "ntohl");
-		pntohs = (LPSOCKNTOHS)GetAddress(hLib, "ntohs");
-		precv = (LPSOCKRECV)GetAddress(hLib, "recv");
-		precvfrom = (LPSOCKRECVFROM)GetAddress(hLib, "recvfrom");
-		pselect = (LPSOCKSELECT)GetAddress(hLib, "select");
-		psend = (LPSOCKSEND)GetAddress(hLib, "send");
-		psendto = (LPSOCKSENDTO)GetAddress(hLib, "sendto");
-		psetsockopt = (LPSOCKSETSOCKOPT)GetAddress(hLib, "setsockopt");
-		pshutdown = (LPSOCKSHUTDOWN)GetAddress(hLib, "shutdown");
-		psocket = (LPSOCKSOCKET)GetAddress(hLib, "socket");
-		pgethostbyaddr = (LPSOCKGETHOSTBYADDR)GetAddress(hLib, "gethostbyaddr");
-		pgethostbyname = (LPSOCKGETHOSTBYNAME)GetAddress(hLib, "gethostbyname");
-		pgethostname = (LPSOCKGETHOSTNAME)GetAddress(hLib, "gethostname");
-		pgetservbyport = (LPSOCKGETSERVBYPORT)GetAddress(hLib, "getservbyport");
-		pgetservbyname = (LPSOCKGETSERVBYNAME)GetAddress(hLib, "getservbyname");
-		pgetprotobynumber = (LPSOCKGETPROTOBYNUMBER)GetAddress(hLib, "getprotobynumber");
-		pgetprotobyname = (LPSOCKGETPROTOBYNAME)GetAddress(hLib, "getprotobyname");
-		pWSAStartup = (LPSOCKWSASTARTUP)GetAddress(hLib, "WSAStartup");
-		pWSACleanup = (LPSOCKWSACLEANUP)GetAddress(hLib, "WSACleanup");
-		pWSAGetLastError = (LPSOCKWSAGETLASTERROR)GetAddress(hLib, "WSAGetLastError");
-		pWSAFDIsSet = (LPWSAFDIsSet)GetAddress(hLib, "__WSAFDIsSet");
-		pinet_addr = (LPSOCKINETADDR)GetAddress(hLib,"inet_addr");
-		pinet_ntoa = (LPSOCKINETNTOA)GetAddress(hLib,"inet_ntoa");
-
-		hWinSockDll = hLib;
-	}
-//	LeaveCriticalSection(&csSock);
-}
-
-void EndSockets(void)
-{
-	if(hWinSockDll != NULL)
-	{
-		pWSACleanup();
-		FreeLibrary(hWinSockDll);
-	}
-	hWinSockDll = NULL;
-}
-
-void StartSockets(void) 
-{
-	unsigned short version;
-	WSADATA retdata;
-	int ret;
-	int iSockOpt = SO_SYNCHRONOUS_NONALERT;
-
-	LoadWinSock();
-	//
-	// initalize the winsock interface and insure that it is
-	// cleaned up at exit.
-	//
-	version = 0x101;
-	if(ret = pWSAStartup(version, &retdata))
-		CROAK("Unable to locate winsock library!\n");
-	if(retdata.wVersion != version)
-		CROAK("Could not find version 1.1 of winsock dll\n");
-
-	// atexit((void (*)(void)) EndSockets);
+void *
+GetAddress(HINSTANCE hInstance, char *lpFunctionName)
+{
+    char buffer[512];
+    FARPROC proc = GetProcAddress(hInstance, lpFunctionName);
+    if(proc == 0) {
+	sprintf(buffer, "Unable to get address of %s in WSock32.dll", lpFunctionName);
+	CROAK(buffer);
+    }
+    return proc;
+}
+
+void
+LoadWinSock(void)
+{
+/*  EnterCriticalSection(&csSock); */
+    if(hWinSockDll == NULL) {
+	HINSTANCE hLib = LoadLibrary("WSock32.DLL");
+	if(hLib == NULL)
+	    CROAK("Could not load WSock32.dll\n");
+
+	paccept = (LPSOCKACCEPT)GetAddress(hLib, "accept");
+	pbind = (LPSOCKBIND)GetAddress(hLib, "bind");
+	pclosesocket = (LPSOCKCLOSESOCKET)GetAddress(hLib, "closesocket");
+	pconnect = (LPSOCKCONNECT)GetAddress(hLib, "connect");
+	pioctlsocket = (LPSOCKIOCTLSOCKET)GetAddress(hLib, "ioctlsocket");
+	pgetpeername = (LPSOCKGETPEERNAME)GetAddress(hLib, "getpeername");
+	pgetsockname = (LPSOCKGETSOCKNAME)GetAddress(hLib, "getsockname");
+	pgetsockopt = (LPSOCKGETSOCKOPT)GetAddress(hLib, "getsockopt");
+	phtonl = (LPSOCKHTONL)GetAddress(hLib, "htonl");
+	phtons = (LPSOCKHTONS)GetAddress(hLib, "htons");
+	plisten = (LPSOCKLISTEN)GetAddress(hLib, "listen");
+	pntohl = (LPSOCKNTOHL)GetAddress(hLib, "ntohl");
+	pntohs = (LPSOCKNTOHS)GetAddress(hLib, "ntohs");
+	precv = (LPSOCKRECV)GetAddress(hLib, "recv");
+	precvfrom = (LPSOCKRECVFROM)GetAddress(hLib, "recvfrom");
+	pselect = (LPSOCKSELECT)GetAddress(hLib, "select");
+	psend = (LPSOCKSEND)GetAddress(hLib, "send");
+	psendto = (LPSOCKSENDTO)GetAddress(hLib, "sendto");
+	psetsockopt = (LPSOCKSETSOCKOPT)GetAddress(hLib, "setsockopt");
+	pshutdown = (LPSOCKSHUTDOWN)GetAddress(hLib, "shutdown");
+	psocket = (LPSOCKSOCKET)GetAddress(hLib, "socket");
+	pgethostbyaddr = (LPSOCKGETHOSTBYADDR)GetAddress(hLib, "gethostbyaddr");
+	pgethostbyname = (LPSOCKGETHOSTBYNAME)GetAddress(hLib, "gethostbyname");
+	pgethostname = (LPSOCKGETHOSTNAME)GetAddress(hLib, "gethostname");
+	pgetservbyport = (LPSOCKGETSERVBYPORT)GetAddress(hLib, "getservbyport");
+	pgetservbyname = (LPSOCKGETSERVBYNAME)GetAddress(hLib, "getservbyname");
+	pgetprotobynumber = (LPSOCKGETPROTOBYNUMBER)GetAddress(hLib, "getprotobynumber");
+	pgetprotobyname = (LPSOCKGETPROTOBYNAME)GetAddress(hLib, "getprotobyname");
+	pWSAStartup = (LPSOCKWSASTARTUP)GetAddress(hLib, "WSAStartup");
+	pWSACleanup = (LPSOCKWSACLEANUP)GetAddress(hLib, "WSACleanup");
+	pWSAGetLastError = (LPSOCKWSAGETLASTERROR)GetAddress(hLib, "WSAGetLastError");
+	pWSAFDIsSet = (LPWSAFDIsSet)GetAddress(hLib, "__WSAFDIsSet");
+	pinet_addr = (LPSOCKINETADDR)GetAddress(hLib,"inet_addr");
+	pinet_ntoa = (LPSOCKINETNTOA)GetAddress(hLib,"inet_ntoa");
+
+	hWinSockDll = hLib;
+    }
+/*  LeaveCriticalSection(&csSock); */
+}
+
+void
+EndSockets(void)
+{
+    if(hWinSockDll != NULL) {
+	pWSACleanup();
+	FreeLibrary(hWinSockDll);
+    }
+    hWinSockDll = NULL;
+}
+
+void
+StartSockets(void) 
+{
+    unsigned short version;
+    WSADATA retdata;
+    int ret;
+    int iSockOpt = SO_SYNCHRONOUS_NONALERT;
+
+    LoadWinSock();
+    /*
+     * initalize the winsock interface and insure that it is
+     * cleaned up at exit.
+     */
+    version = 0x101;
+    if(ret = pWSAStartup(version, &retdata))
+	CROAK("Unable to locate winsock library!\n");
+    if(retdata.wVersion != version)
+	CROAK("Could not find version 1.1 of winsock dll\n");
+
+    /* atexit((void (*)(void)) EndSockets); */
 
 #ifdef USE_SOCKETS_AS_HANDLES
-	//
-	// Enable the use of sockets as filehandles
-	//
-	psetsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&iSockOpt, sizeof(iSockOpt));
-#endif	// USE_SOCKETS_AS_HANDLES
+    /*
+     * Enable the use of sockets as filehandles
+     */
+    psetsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
+		(char *)&iSockOpt, sizeof(iSockOpt));
+#endif	/* USE_SOCKETS_AS_HANDLES */
 }
 
 
 #ifndef USE_SOCKETS_AS_HANDLES
-FILE *myfdopen(int fd, char *mode)
+FILE *
+myfdopen(int fd, char *mode)
 {
-	FILE *fp;
-	char sockbuf[256];
-	int optlen = sizeof(sockbuf);
-	int retval;
+    FILE *fp;
+    char sockbuf[256];
+    int optlen = sizeof(sockbuf);
+    int retval;
 
-	
-	if(hWinSockDll == 0)
-		LoadWinSock();
-
-	retval = pgetsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
-	if(retval == SOCKET_ERROR && pWSAGetLastError() == WSAENOTSOCK) 
-	{
-		return(_fdopen(fd, mode));
-	}
+    if (hWinSockDll == 0)
+	LoadWinSock();
 
-	//
-	// If we get here, then fd is actually a socket.
-	//
-	Newz(1601, fp, 1, FILE);
-	if(fp == NULL)
-	{
-		errno = ENOMEM;
-		return NULL;
-	}
+    retval = pgetsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
+    if(retval == SOCKET_ERROR && pWSAGetLastError() == WSAENOTSOCK) {
+	return(_fdopen(fd, mode));
+    }
 
-	fp->_file = fd;
-	if(*mode == 'r')
-		fp->_flag = _IOREAD;
-	else
-		fp->_flag = _IOWRT;
+    /*
+     * If we get here, then fd is actually a socket.
+     */
+    Newz(1601, fp, 1, FILE);
+    if(fp == NULL) {
+	errno = ENOMEM;
+	return NULL;
+    }
 
-	return fp;
+    fp->_file = fd;
+    if(*mode == 'r')
+	fp->_flag = _IOREAD;
+    else
+	fp->_flag = _IOWRT;
+   
+    return fp;
 }
-#endif	// USE_SOCKETS_AS_HANDLES
+#endif	/* USE_SOCKETS_AS_HANDLES */
 
 
-u_long win32_htonl(u_long hostlong)
+u_long
+win32_htonl(u_long hostlong)
 {
-	if(hWinSockDll == 0)
-		LoadWinSock();
+    if(hWinSockDll == 0)
+	LoadWinSock();
 
-	return phtonl(hostlong);
+    return phtonl(hostlong);
 }
 
-u_short win32_htons(u_short hostshort)
+u_short
+win32_htons(u_short hostshort)
 {
-	if(hWinSockDll == 0)
-		LoadWinSock();
+    if(hWinSockDll == 0)
+	LoadWinSock();
 
-	return phtons(hostshort);
+    return phtons(hostshort);
 }
 
-u_long win32_ntohl(u_long netlong)
+u_long
+win32_ntohl(u_long netlong)
 {
-	if(hWinSockDll == 0)
-		LoadWinSock();
+    if(hWinSockDll == 0)
+	LoadWinSock();
 
-	return pntohl(netlong);
+    return pntohl(netlong);
 }
 
-u_short win32_ntohs(u_short netshort)
+u_short
+win32_ntohs(u_short netshort)
 {
-	if(hWinSockDll == 0)
-		LoadWinSock();
+    if(hWinSockDll == 0)
+	LoadWinSock();
 
-	return pntohs(netshort);
+    return pntohs(netshort);
 }
 
 
 #define SOCKET_TEST(x, y)	if(hWinSockDll == 0) StartSockets();\
-							if((x) == (y)) errno = pWSAGetLastError()
+				if((x) == (y)) errno = pWSAGetLastError()
 
-#define SOCKET_TEST_ERROR(x) SOCKET_TEST(x,	SOCKET_ERROR)
+#define SOCKET_TEST_ERROR(x) SOCKET_TEST(x, SOCKET_ERROR)
 
-SOCKET win32_accept(SOCKET s, struct sockaddr *addr, int *addrlen)
+SOCKET
+win32_accept(SOCKET s, struct sockaddr *addr, int *addrlen)
 {
-	SOCKET r;
+    SOCKET r;
 
-	SOCKET_TEST((r = paccept(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET);
-	return OPEN_SOCKET(r);
+    SOCKET_TEST((r = paccept(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET);
+    return OPEN_SOCKET(r);
 }
 
-int win32_bind(SOCKET s, const struct sockaddr *addr, int addrlen)
+int
+win32_bind(SOCKET s, const struct sockaddr *addr, int addrlen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pbind(TO_SOCKET(s), addr, addrlen));
-	return r;
+    SOCKET_TEST_ERROR(r = pbind(TO_SOCKET(s), addr, addrlen));
+    return r;
 }
 
-int win32_connect(SOCKET s, const struct sockaddr *addr, int addrlen)
+int
+win32_connect(SOCKET s, const struct sockaddr *addr, int addrlen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pconnect(TO_SOCKET(s), addr, addrlen));
-	return r;
+    SOCKET_TEST_ERROR(r = pconnect(TO_SOCKET(s), addr, addrlen));
+    return r;
 }
 
 
-int win32_getpeername(SOCKET s, struct sockaddr *addr, int *addrlen)
+int
+win32_getpeername(SOCKET s, struct sockaddr *addr, int *addrlen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pgetpeername(TO_SOCKET(s), addr, addrlen));
-	return r;
+    SOCKET_TEST_ERROR(r = pgetpeername(TO_SOCKET(s), addr, addrlen));
+    return r;
 }
 
-int win32_getsockname(SOCKET s, struct sockaddr *addr, int *addrlen)
+int
+win32_getsockname(SOCKET s, struct sockaddr *addr, int *addrlen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pgetsockname(TO_SOCKET(s), addr, addrlen));
-	return r;
+    SOCKET_TEST_ERROR(r = pgetsockname(TO_SOCKET(s), addr, addrlen));
+    return r;
 }
 
-int win32_getsockopt(SOCKET s, int level, int optname, char *optval, int *optlen)
+int
+win32_getsockopt(SOCKET s, int level, int optname, char *optval, int *optlen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pgetsockopt(TO_SOCKET(s), level, optname, optval, optlen));
-	return r;
+    SOCKET_TEST_ERROR(r = pgetsockopt(TO_SOCKET(s), level, optname, optval, optlen));
+    return r;
 }
 
-int win32_ioctlsocket(SOCKET s, long cmd, u_long *argp)
+int
+win32_ioctlsocket(SOCKET s, long cmd, u_long *argp)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pioctlsocket(TO_SOCKET(s), cmd, argp));
-	return r;
+    SOCKET_TEST_ERROR(r = pioctlsocket(TO_SOCKET(s), cmd, argp));
+    return r;
 }
 
-int win32_listen(SOCKET s, int backlog)
+int
+win32_listen(SOCKET s, int backlog)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = plisten(TO_SOCKET(s), backlog));
-	return r;
+    SOCKET_TEST_ERROR(r = plisten(TO_SOCKET(s), backlog));
+    return r;
 }
 
-int win32_recv(SOCKET s, char *buf, int len, int flags)
+int
+win32_recv(SOCKET s, char *buf, int len, int flags)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = precv(TO_SOCKET(s), buf, len, flags));
-	return r;
+    SOCKET_TEST_ERROR(r = precv(TO_SOCKET(s), buf, len, flags));
+    return r;
 }
 
-int win32_recvfrom(SOCKET s, char *buf, int len, int flags, struct sockaddr *from, int *fromlen)
+int
+win32_recvfrom(SOCKET s, char *buf, int len, int flags, struct sockaddr *from, int *fromlen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = precvfrom(TO_SOCKET(s), buf, len, flags, from, fromlen));
-	return r;
+    SOCKET_TEST_ERROR(r = precvfrom(TO_SOCKET(s), buf, len, flags, from, fromlen));
+    return r;
 }
 
-// select contributed by Vincent R. Slyngstad (vrs@ibeam.intel.com)
-int win32_select(int nfds, int* rd, int* wr, int* ex, const struct timeval* timeout)
+/* select contributed by Vincent R. Slyngstad (vrs@ibeam.intel.com) */
+int
+win32_select(int nfds, int* rd, int* wr, int* ex, const struct timeval* timeout)
 {
-	long r;
-	int dummy = 0;
-	int i, fd, bit, offset;
-	FD_SET nrd, nwr, nex,*prd,*pwr,*pex;
+    long r;
+    int dummy = 0;
+    int i, fd, bit, offset;
+    FD_SET nrd, nwr, nex,*prd,*pwr,*pex;
 
-	if (!rd) rd = &dummy, prd = NULL;
-	else prd = &nrd;
-	if (!wr) wr = &dummy, pwr = NULL;
-	else pwr = &nwr;
-	if (!ex) ex = &dummy, pex = NULL;
-	else pex = &nex;
+    if (!rd)
+	rd = &dummy, prd = NULL;
+    else
+	prd = &nrd;
+    if (!wr)
+	wr = &dummy, pwr = NULL;
+    else
+	pwr = &nwr;
+    if (!ex)
+	ex = &dummy, pex = NULL;
+    else
+	pex = &nex;
 
-	FD_ZERO(&nrd);
-	FD_ZERO(&nwr);
-	FD_ZERO(&nex);
-	for (i = 0; i < nfds; i++) 
-	{
-		fd = TO_SOCKET(i);
-		bit = 1L<<(i % (sizeof(int)*8));
-		offset = i / (sizeof(int)*8);
-		if (rd[offset] & bit)
-			FD_SET(fd, &nrd);
-		if (wr[offset] & bit)
-			FD_SET(fd, &nwr);
-		if (ex[offset] & bit)
-			FD_SET(fd, &nex);
-	}
+    FD_ZERO(&nrd);
+    FD_ZERO(&nwr);
+    FD_ZERO(&nex);
+    for (i = 0; i < nfds; i++) {
+	fd = TO_SOCKET(i);
+	bit = 1L<<(i % (sizeof(int)*8));
+	offset = i / (sizeof(int)*8);
+	if (rd[offset] & bit)
+	    FD_SET(fd, &nrd);
+	if (wr[offset] & bit)
+	    FD_SET(fd, &nwr);
+	if (ex[offset] & bit)
+	    FD_SET(fd, &nex);
+    }
+
+    SOCKET_TEST_ERROR(r = pselect(nfds, prd, pwr, pex, timeout));
 
-	SOCKET_TEST_ERROR(r = pselect(nfds, prd, pwr, pex, timeout));
-
-	for (i = 0; i < nfds; i++) 
-	{
-		fd = TO_SOCKET(i);
-		bit = 1L<<(i % (sizeof(int)*8));
-		offset = i / (sizeof(int)*8);
-		if (rd[offset] & bit) 
-		{
-			if (!pWSAFDIsSet(fd, &nrd))
-				rd[offset] &= ~bit;
-		}
-		if (wr[offset] & bit) 
-		{
-			if (!pWSAFDIsSet(fd, &nwr))
-				wr[offset] &= ~bit;
-		}
-		if (ex[offset] & bit) 
-		{
-			if (!pWSAFDIsSet(fd, &nex))
-				ex[offset] &= ~bit;
-		}
+    for (i = 0; i < nfds; i++) {
+	fd = TO_SOCKET(i);
+	bit = 1L<<(i % (sizeof(int)*8));
+	offset = i / (sizeof(int)*8);
+	if (rd[offset] & bit) {
+	    if (!pWSAFDIsSet(fd, &nrd))
+		rd[offset] &= ~bit;
+	}
+	if (wr[offset] & bit) {
+	    if (!pWSAFDIsSet(fd, &nwr))
+		wr[offset] &= ~bit;
+	}
+	if (ex[offset] & bit) {
+	    if (!pWSAFDIsSet(fd, &nex))
+		ex[offset] &= ~bit;
 	}
-	return r;
+    }
+    return r;
 }
 
-int win32_send(SOCKET s, const char *buf, int len, int flags)
+int
+win32_send(SOCKET s, const char *buf, int len, int flags)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = psend(TO_SOCKET(s), buf, len, flags));
-	return r;
+    SOCKET_TEST_ERROR(r = psend(TO_SOCKET(s), buf, len, flags));
+    return r;
 }
 
-int win32_sendto(SOCKET s, const char *buf, int len, int flags, const struct sockaddr *to, int tolen)
+int
+win32_sendto(SOCKET s, const char *buf, int len, int flags,
+	     const struct sockaddr *to, int tolen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = psendto(TO_SOCKET(s), buf, len, flags, to, tolen));
-	return r;
+    SOCKET_TEST_ERROR(r = psendto(TO_SOCKET(s), buf, len, flags, to, tolen));
+    return r;
 }
 
-int win32_setsockopt(SOCKET s, int level, int optname, const char *optval, int optlen)
+int
+win32_setsockopt(SOCKET s, int level, int optname, const char *optval, int optlen)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = psetsockopt(TO_SOCKET(s), level, optname, optval, optlen));
-	return r;
+    SOCKET_TEST_ERROR(r = psetsockopt(TO_SOCKET(s), level, optname, optval, optlen));
+    return r;
 }
     
-int win32_shutdown(SOCKET s, int how)
+int
+win32_shutdown(SOCKET s, int how)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pshutdown(TO_SOCKET(s), how));
-	return r;
+    SOCKET_TEST_ERROR(r = pshutdown(TO_SOCKET(s), how));
+    return r;
 }
 
-SOCKET win32_socket(int af, int type, int protocol)
+SOCKET
+win32_socket(int af, int type, int protocol)
 {
-	SOCKET s;
+    SOCKET s;
 
 #ifndef USE_SOCKETS_AS_HANDLES
-	SOCKET_TEST(s = psocket(af, type, protocol), INVALID_SOCKET);
+    SOCKET_TEST(s = psocket(af, type, protocol), INVALID_SOCKET);
 #else
-	if(hWinSockDll == 0)
-		StartSockets();
+    if(hWinSockDll == 0)
+	StartSockets();
 
-	if((s = psocket(af, type, protocol)) == INVALID_SOCKET)
-		errno = pWSAGetLastError();
-	else
-		s = OPEN_SOCKET(s);
-#endif	// USE_SOCKETS_AS_HANDLES
+    if((s = psocket(af, type, protocol)) == INVALID_SOCKET)
+	errno = pWSAGetLastError();
+    else
+	s = OPEN_SOCKET(s);
+#endif	/* USE_SOCKETS_AS_HANDLES */
 
-	return s;
+    return s;
 }
 
-struct hostent *win32_gethostbyaddr(const char *addr, int len, int type)
+struct hostent *
+win32_gethostbyaddr(const char *addr, int len, int type)
 {
-	struct hostent *r;
+    struct hostent *r;
 
-	SOCKET_TEST(r = pgethostbyaddr(addr, len, type), NULL);
-	return r;
+    SOCKET_TEST(r = pgethostbyaddr(addr, len, type), NULL);
+    return r;
 }
 
-struct hostent *win32_gethostbyname(const char *name)
+struct hostent *
+win32_gethostbyname(const char *name)
 {
-	struct hostent *r;
+    struct hostent *r;
 
-	SOCKET_TEST(r = pgethostbyname(name), NULL);
-	return r;
+    SOCKET_TEST(r = pgethostbyname(name), NULL);
+    return r;
 }
 
-int win32_gethostname(char *name, int len)
+int
+win32_gethostname(char *name, int len)
 {
-	int r;
+    int r;
 
-	SOCKET_TEST_ERROR(r = pgethostname(name, len));
-	return r;
+    SOCKET_TEST_ERROR(r = pgethostname(name, len));
+    return r;
 }
 
-struct protoent *win32_getprotobyname(const char *name)
+struct protoent *
+win32_getprotobyname(const char *name)
 {
-	struct protoent *r;
+    struct protoent *r;
 
-	SOCKET_TEST(r = pgetprotobyname(name), NULL);
-	return r;
+    SOCKET_TEST(r = pgetprotobyname(name), NULL);
+    return r;
 }
 
-struct protoent *win32_getprotobynumber(int num)
+struct protoent *
+win32_getprotobynumber(int num)
 {
-	struct protoent *r;
+    struct protoent *r;
 
-	SOCKET_TEST(r = pgetprotobynumber(num), NULL);
-	return r;
+    SOCKET_TEST(r = pgetprotobynumber(num), NULL);
+    return r;
 }
 
-struct servent *win32_getservbyname(const char *name, const char *proto)
+struct servent *
+win32_getservbyname(const char *name, const char *proto)
 {
-	struct servent *r;
-
-	SOCKET_TEST(r = pgetservbyname(name, proto), NULL);
-	if (r) {
-		r = win32_savecopyservent(&myservent, r, proto);
-		}
-	return r;
+    struct servent *r;
+   
+    SOCKET_TEST(r = pgetservbyname(name, proto), NULL);
+    if (r) {
+	r = win32_savecopyservent(&myservent, r, proto);
+    }
+    return r;
 }
 
-struct servent *win32_getservbyport(int port, const char *proto)
+struct servent *
+win32_getservbyport(int port, const char *proto)
 {
-	struct servent *r;
+    struct servent *r;
 
-	SOCKET_TEST(r = pgetservbyport(port, proto), NULL);
-	if (r) {
-		r = win32_savecopyservent(&myservent, r, proto);
-		}
-	return r;
+    SOCKET_TEST(r = pgetservbyport(port, proto), NULL);
+    if (r) {
+	r = win32_savecopyservent(&myservent, r, proto);
+    }
+    return r;
 }
 
-char FAR *win32_inet_ntoa(struct in_addr in)
+char FAR *
+win32_inet_ntoa(struct in_addr in)
 {
-	if(hWinSockDll == 0) LoadWinSock();
+    if(hWinSockDll == 0)
+	LoadWinSock();
 
-	return pinet_ntoa(in);
+    return pinet_ntoa(in);
 }
 
-unsigned long win32_inet_addr(const char FAR *cp)
+unsigned long
+win32_inet_addr(const char FAR *cp)
 {
-	if(hWinSockDll == 0) LoadWinSock();
+    if(hWinSockDll == 0)
+	LoadWinSock();
 
-	return pinet_addr(cp);
+    return pinet_addr(cp);
 
 }
-//
-// Networking stubs
-//
+
+/*
+ * Networking stubs
+ */
 #undef CROAK 
 #define CROAK croak
 
-void win32_endhostent() 
+void
+win32_endhostent() 
 {
-	CROAK("endhostent not implemented!\n");
+    CROAK("endhostent not implemented!\n");
 }
 
-void win32_endnetent()
+void
+win32_endnetent()
 {
-	CROAK("endnetent not implemented!\n");
+    CROAK("endnetent not implemented!\n");
 }
 
-void win32_endprotoent()
+void
+win32_endprotoent()
 {
-	CROAK("endprotoent not implemented!\n");
+    CROAK("endprotoent not implemented!\n");
 }
 
-void win32_endservent()
+void
+win32_endservent()
 {
-	CROAK("endservent not implemented!\n");
+    CROAK("endservent not implemented!\n");
 }
 
 
-struct netent *win32_getnetent(void) 
+struct netent *
+win32_getnetent(void) 
 {
-	CROAK("getnetent not implemented!\n");
-	return (struct netent *) NULL;
+    CROAK("getnetent not implemented!\n");
+    return (struct netent *) NULL;
 }
 
-struct netent *win32_getnetbyname(char *name) 
+struct netent *
+win32_getnetbyname(char *name) 
 {
-	CROAK("getnetbyname not implemented!\n");
-	return (struct netent *)NULL;
+    CROAK("getnetbyname not implemented!\n");
+    return (struct netent *)NULL;
 }
 
-struct netent *win32_getnetbyaddr(long net, int type) 
+struct netent *
+win32_getnetbyaddr(long net, int type) 
 {
-	CROAK("getnetbyaddr not implemented!\n");
-	return (struct netent *)NULL;
+    CROAK("getnetbyaddr not implemented!\n");
+    return (struct netent *)NULL;
 }
 
-struct protoent *win32_getprotoent(void) 
+struct protoent *
+win32_getprotoent(void) 
 {
-	CROAK("getprotoent not implemented!\n");
-	return (struct protoent *) NULL;
+    CROAK("getprotoent not implemented!\n");
+    return (struct protoent *) NULL;
 }
 
-struct servent *win32_getservent(void) 
+struct servent *
+win32_getservent(void) 
 {
-	CROAK("getservent not implemented!\n");
-	return (struct servent *) NULL;
+    CROAK("getservent not implemented!\n");
+    return (struct servent *) NULL;
 }
 
-void win32_sethostent(int stayopen)
+void
+win32_sethostent(int stayopen)
 {
-	CROAK("sethostent not implemented!\n");
+    CROAK("sethostent not implemented!\n");
 }
 
 
-void win32_setnetent(int stayopen)
+void
+win32_setnetent(int stayopen)
 {
-	CROAK("setnetent not implemented!\n");
+    CROAK("setnetent not implemented!\n");
 }
 
 
-void win32_setprotoent(int stayopen)
+void
+win32_setprotoent(int stayopen)
 {
-	CROAK("setprotoent not implemented!\n");
+    CROAK("setprotoent not implemented!\n");
 }
 
 
-void win32_setservent(int stayopen)
+void
+win32_setservent(int stayopen)
 {
-	CROAK("setservent not implemented!\n");
+    CROAK("setservent not implemented!\n");
 }