21 files changed, 453 insertions, 457 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 093edf8..bd06089 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 
-VERSION 		= @TCL_VERSION@
+VERSION		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
 MINOR_VERSION		= @TCL_MINOR_VERSION@
 PATCH_LEVEL		= @TCL_PATCH_LEVEL@
@@ -1101,7 +1101,7 @@ install-libraries: libraries
 	@if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ] ; then \
 	    echo "Customizing tcl module path"; \
 	    echo "if {![interp issafe]} { ::tcl::tm::roots [list $(TCL_MODULE_PATH)] }" >> \
-	        "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
+		    "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
 	fi
 
 install-tzdata:
diff --git a/unix/configure b/unix/configure
index b470e3c..2ef18ad 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5796,7 +5796,7 @@ then :
 			;;
 		    *)
 			# Make sure only first arg gets _r
-		    	CC=`echo "$CC" | sed -e 's/^\([^ ]*\)/\1_r/'`
+			CC=`echo "$CC" | sed -e 's/^\([^ ]*\)/\1_r/'`
 			;;
 		esac
 		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using $CC for compiling with threads" >&5
@@ -10016,7 +10016,7 @@ int
 main (void)
 {
 
-    	socklen_t foo;
+	socklen_t foo;
 
   ;
   return 0;
diff --git a/unix/configure.ac b/unix/configure.ac
index 766392e..f2a1b58 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -404,7 +404,7 @@ AC_CACHE_CHECK([for socklen_t], tcl_cv_type_socklen_t, [
 	#include <sys/types.h>
 	#include <sys/socket.h>
     ]], [[
-    	socklen_t foo;
+	socklen_t foo;
     ]])],[tcl_cv_type_socklen_t=yes],[tcl_cv_type_socklen_t=no])])
 if test $tcl_cv_type_socklen_t = no; then
     AC_DEFINE(socklen_t, int, [Define as int if socklen_t is not available])
diff --git a/unix/dltest/embtest.c b/unix/dltest/embtest.c
index ff58cc4..33f77a0 100644
--- a/unix/dltest/embtest.c
+++ b/unix/dltest/embtest.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv) {
 	exitcode = 1;
     }
     if (!exitcode) {
-    	printf("All OK!\n");
+	printf("All OK!\n");
     }
     return exitcode;
 }
diff --git a/unix/installManPage b/unix/installManPage
index 3d5fa7b..3cb266d 100755
--- a/unix/installManPage
+++ b/unix/installManPage
@@ -12,8 +12,8 @@ Suffix=""
 
 while true; do
     case $1 in
-        -s | --symlinks  )      Sym="-s "      ;;
-        -z | --compress  )     Gzip=$2;  shift ;;
+	-s | --symlinks  )      Sym="-s "      ;;
+	-z | --compress  )     Gzip=$2;  shift ;;
 	-e | --extension )       Gz=$2;  shift ;;
 	-x | --suffix    )   Suffix=$2;  shift ;;
 	-*) cat <<EOF
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 7b84923..2b2299e 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -990,7 +990,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 			;;
 		    *)
 			# Make sure only first arg gets _r
-		    	CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
+			CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
 			;;
 		esac
 		AC_MSG_RESULT([Using $CC for compiling with threads])
diff --git a/unix/tclEpollNotfy.c b/unix/tclEpollNotfy.c
index 2a1733a..8c392f0 100644
--- a/unix/tclEpollNotfy.c
+++ b/unix/tclEpollNotfy.c
@@ -207,10 +207,10 @@ PlatformEventsControl(
 	newEvent.events |= EPOLLOUT;
     }
     if (isNew) {
-        newPedPtr = (struct PlatformEventData *)
+	newPedPtr = (struct PlatformEventData *)
 		Tcl_Alloc(sizeof(struct PlatformEventData));
-        newPedPtr->filePtr = filePtr;
-        newPedPtr->tsdPtr = tsdPtr;
+	newPedPtr->filePtr = filePtr;
+	newPedPtr->tsdPtr = tsdPtr;
 	filePtr->pedPtr = newPedPtr;
     }
     newEvent.data.ptr = filePtr->pedPtr;
@@ -263,7 +263,7 @@ PlatformEventsControl(
  *	None.
  *
  * Side effects:
- * 	While tsdPtr->notifierMutex is held:
+ *	While tsdPtr->notifierMutex is held:
  *	- The per-thread eventfd(2) is closed, if non-zero, and set to -1.
  *	- The per-thread epoll(7) fd is closed, if non-zero, and set to 0.
  *	- The per-thread epoll_event structs are freed, if any, and set to 0.
@@ -367,7 +367,7 @@ PlatformEventsInit(void)
     filePtr->mask = TCL_READABLE;
     PlatformEventsControl(filePtr, tsdPtr, EPOLL_CTL_ADD, 1);
     if (!tsdPtr->readyEvents) {
-        tsdPtr->maxReadyEvents = 512;
+	tsdPtr->maxReadyEvents = 512;
 	tsdPtr->readyEvents = (struct epoll_event *) Tcl_Alloc(
 		tsdPtr->maxReadyEvents * sizeof(tsdPtr->readyEvents[0]));
     }
diff --git a/unix/tclKqueueNotfy.c b/unix/tclKqueueNotfy.c
index ba49842..a99f7bd 100644
--- a/unix/tclKqueueNotfy.c
+++ b/unix/tclKqueueNotfy.c
@@ -261,7 +261,7 @@ PlatformEventsControl(
  *	None.
  *
  * Side effects:
- * 	While tsdPtr->notifierMutex is held:
+ *	While tsdPtr->notifierMutex is held:
  *	The per-thread pipe(2) fds are closed, if non-zero, and set to -1.
  *	The per-thread kqueue(2) fd is closed, if non-zero, and set to 0.
  *	The per-thread kevent structs are freed, if any, and set to 0.
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index 23565c5..07bbc16 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -88,14 +88,14 @@ TclpDlopen(
      * Use (RTLD_NOW|RTLD_LOCAL) as default, see [Bug #3216070]
      */
     if (flags & TCL_LOAD_GLOBAL) {
-    	dlopenflags |= RTLD_GLOBAL;
+	dlopenflags |= RTLD_GLOBAL;
     } else {
-    	dlopenflags |= RTLD_LOCAL;
+	dlopenflags |= RTLD_LOCAL;
     }
     if (flags & TCL_LOAD_LAZY) {
-    	dlopenflags |= RTLD_LAZY;
+	dlopenflags |= RTLD_LAZY;
     } else {
-    	dlopenflags |= RTLD_NOW;
+	dlopenflags |= RTLD_NOW;
     }
     handle = dlopen(native, dlopenflags);
     if (handle == NULL) {
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 54290ec..5b1062e 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -197,14 +197,14 @@ TclpDlopen(
      */
 
     if (flags & TCL_LOAD_GLOBAL) {
-    	dlopenflags |= RTLD_GLOBAL;
+	dlopenflags |= RTLD_GLOBAL;
     } else {
-    	dlopenflags |= RTLD_LOCAL;
+	dlopenflags |= RTLD_LOCAL;
     }
     if (flags & TCL_LOAD_LAZY) {
-    	dlopenflags |= RTLD_LAZY;
+	dlopenflags |= RTLD_LAZY;
     } else {
-    	dlopenflags |= RTLD_NOW;
+	dlopenflags |= RTLD_NOW;
     }
     dlHandle = dlopen(nativePath, dlopenflags);
     if (!dlHandle) {
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index 81f314f..9c34e73 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -128,7 +128,7 @@ TclpDlopen(
      */
 
     if ((pkg = strrchr(fileName, '/')) == NULL) {
-        pkg = fileName;
+	pkg = fileName;
     } else {
 	pkg++;
     }
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index edb1edb..693720c 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -161,22 +161,22 @@ static int		TtySetOptionProc(void *instanceData,
 
 static const Tcl_ChannelType fileChannelType = {
     "file",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,		/* Close proc. */
-    FileInputProc,		/* Input proc. */
-    FileOutputProc,		/* Output proc. */
-	NULL,
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    FileInputProc,
+    FileOutputProc,
+    NULL,			/* Deprecated. */
     NULL,			/* Set option proc. */
-    FileGetOptionProc,		/* Get option proc. */
-    FileWatchProc,		/* Initialize notifier. */
-    FileGetHandleProc,		/* Get OS handles out of channel. */
-    FileCloseProc,		/* close2proc. */
-    FileBlockModeProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    FileWideSeekProc,		/* wide seek proc. */
-    NULL,
-    FileTruncateProc		/* truncate proc. */
+    FileGetOptionProc,
+    FileWatchProc,
+    FileGetHandleProc,
+    FileCloseProc,
+    FileBlockModeProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
+    FileWideSeekProc,
+    NULL,			/* Thread action proc. */
+    FileTruncateProc
 };
 
 #ifdef SUPPORTS_TTY
@@ -186,23 +186,23 @@ static const Tcl_ChannelType fileChannelType = {
  */
 
 static const Tcl_ChannelType ttyChannelType = {
-    "tty",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,		/* Close proc. */
-    FileInputProc,		/* Input proc. */
-    FileOutputProc,		/* Output proc. */
+    "tty",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    FileInputProc,
+    FileOutputProc,
+    NULL,			/* Deprecated. */
+    TtySetOptionProc,
+    TtyGetOptionProc,
+    FileWatchProc,
+    FileGetHandleProc,
+    TtyCloseProc,
+    FileBlockModeProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
     NULL,			/* Seek proc. */
-    TtySetOptionProc,		/* Set option proc. */
-    TtyGetOptionProc,		/* Get option proc. */
-    FileWatchProc,		/* Initialize notifier. */
-    FileGetHandleProc,		/* Get OS handles out of channel. */
-    TtyCloseProc,			/* close2proc. */
-    FileBlockModeProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    NULL,			/* wide seek proc. */
-    NULL,			/* thread action proc. */
-    NULL			/* truncate proc. */
+    NULL,			/* Thread action proc. */
+    NULL			/* Truncate proc. */
 };
 #endif	/* SUPPORTS_TTY */
 
@@ -225,7 +225,7 @@ static const Tcl_ChannelType ttyChannelType = {
 
 static int
 FileBlockModeProc(
-    void *instanceData,	/* File state. */
+    void *instanceData,		/* File state. */
     int mode)			/* The mode to set. Can be TCL_MODE_BLOCKING
 				 * or TCL_MODE_NONBLOCKING. */
 {
@@ -258,7 +258,7 @@ FileBlockModeProc(
 
 static int
 FileInputProc(
-    void *instanceData,	/* File state. */
+    void *instanceData,		/* File state. */
     char *buf,			/* Where to store data read. */
     int toRead,			/* How much space is available in the
 				 * buffer? */
@@ -308,7 +308,7 @@ FileInputProc(
 
 static int
 FileOutputProc(
-    void *instanceData,	/* File state. */
+    void *instanceData,		/* File state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCodePtr)		/* Where to store error code. */
@@ -355,7 +355,7 @@ FileOutputProc(
 
 static int
 FileCloseProc(
-    void *instanceData,	/* File state. */
+    void *instanceData,		/* File state. */
     TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
@@ -448,7 +448,7 @@ TtyCloseProc(
 
 static long long
 FileWideSeekProc(
-    void *instanceData,	/* File state. */
+    void *instanceData,		/* File state. */
     long long offset,		/* Offset to seek to. */
     int mode,			/* Relative to where should we seek? Can be
 				 * one of SEEK_START, SEEK_CUR or SEEK_END. */
@@ -496,7 +496,7 @@ FileWatchNotifyChannelWrapper(
 
 static void
 FileWatchProc(
-    void *instanceData,	/* The file state. */
+    void *instanceData,		/* The file state. */
     int mask)			/* Events of interest; an OR-ed combination of
 				 * TCL_READABLE, TCL_WRITABLE and
 				 * TCL_EXCEPTION. */
@@ -536,9 +536,9 @@ FileWatchProc(
 
 static int
 FileGetHandleProc(
-    void *instanceData,	/* The file state. */
+    void *instanceData,		/* The file state. */
     int direction,		/* TCL_READABLE or TCL_WRITABLE */
-    void **handlePtr)	/* Where to store the handle. */
+    void **handlePtr)		/* Where to store the handle. */
 {
     FileState *fsPtr = (FileState *)instanceData;
 
@@ -758,7 +758,7 @@ TtyModemStatusStr(
 
 static int
 TtySetOptionProc(
-    void *instanceData,	/* File state. */
+    void *instanceData,		/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Which option to set? */
     const char *value)		/* New value for option. */
@@ -1098,7 +1098,7 @@ TtySetOptionProc(
 
 static int
 TtyGetOptionProc(
-    void *instanceData,	/* File state. */
+    void *instanceData,		/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Option to get. */
     Tcl_DString *dsPtr)		/* Where to store value(s). */
@@ -1637,22 +1637,18 @@ TtyParseMode(
      * not allow preprocessor directives in their arguments.
      */
 
-    if (
-#if defined(PAREXT)
-        strchr("noems", parity)
+#ifdef PAREXT
+#define PARITY_CHARS	"noems"
+#define PARITY_MSG	"n, o, e, m, or s"
 #else
-        strchr("noe", parity)
+#define PARITY_CHARS	"noe"
+#define PARITY_MSG	"n, o, or e"
 #endif /* PAREXT */
-                               == NULL) {
+
+    if (strchr(PARITY_CHARS, parity) == NULL) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "%s parity: should be %s", bad,
-#if defined(PAREXT)
-		    "n, o, e, m, or s"
-#else
-		    "n, o, or e"
-#endif /* PAREXT */
-		    ));
+		    "%s parity: should be %s", bad, PARITY_MSG));
 	    Tcl_SetErrorCode(interp, "TCL", "VALUE", "SERIALMODE", (char *)NULL);
 	}
 	return TCL_ERROR;
@@ -2054,7 +2050,7 @@ Tcl_GetOpenFile(
 				 * Ignored, we always check that
 				 * the channel is open for the requested
 				 * mode. */
-    void **filePtr)	/* Store pointer to FILE structure here. */
+    void **filePtr)		/* Store pointer to FILE structure here. */
 {
     Tcl_Channel chan;
     int chanMode, fd;
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 30ddb71..def69fa 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -994,17 +994,17 @@ TclWinCPUID(
     /* See: <http://en.wikipedia.org/wiki/CPUID> */
 #if defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64)
     __asm__ __volatile__("movq %%rbx, %%rsi     \n\t" /* save %rbx */
-                 "cpuid            \n\t"
-                 "xchgq %%rsi, %%rbx   \n\t" /* restore the old %rbx */
-                 : "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
-                 : "a"(index));
+	    "cpuid            \n\t"
+	    "xchgq %%rsi, %%rbx   \n\t" /* restore the old %rbx */
+	    : "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
+	    : "a"(index));
     status = TCL_OK;
 #elif defined(__i386__) || defined(_M_IX86)
     __asm__ __volatile__("mov %%ebx, %%esi     \n\t" /* save %ebx */
-                 "cpuid            \n\t"
-                 "xchg %%esi, %%ebx   \n\t" /* restore the old %ebx */
-                 : "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
-                 : "a"(index));
+	    "cpuid            \n\t"
+	    "xchg %%esi, %%ebx   \n\t" /* restore the old %ebx */
+	    : "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
+	    : "a"(index));
     status = TCL_OK;
 #else
     (void)index;
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index b65cdb1..fab9c32 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -809,7 +809,7 @@ TclpObjCopyDirectory(
  *	EEXIST:	    path is a non-empty directory.
  *	EINVAL:	    path is a root directory.
  *	ENOENT:	    path doesn't exist or is "".
- * 	ENOTDIR:    path is not a directory.
+ *	ENOTDIR:    path is not a directory.
  *
  * Side effects:
  *	Directory removed. If an error occurs, the error will be returned
@@ -953,12 +953,12 @@ TraverseUnixTree(
 				 * filled with UTF-8 name of file causing
 				 * error. */
     int doRewind)		/* Flag indicating that to ensure complete
-    				 * traversal of source hierarchy, the readdir
-    				 * loop should be rewound whenever
-    				 * traverseProc has returned TCL_OK; this is
-    				 * required when traverseProc modifies the
-    				 * source hierarchy, e.g. by deleting
-    				 * files. */
+				 * traversal of source hierarchy, the readdir
+				 * loop should be rewound whenever
+				 * traverseProc has returned TCL_OK; this is
+				 * required when traverseProc modifies the
+				 * source hierarchy, e.g. by deleting
+				 * files. */
 {
     Tcl_StatBuf statBuf;
     const char *source, *errfile;
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 93f6aa8..e91ed41 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -13,8 +13,9 @@
 #include "tclInt.h"
 #include "tclFileSystem.h"
 
-static int NativeMatchType(Tcl_Interp *interp, const char* nativeEntry,
-	const char* nativeName, Tcl_GlobTypeData *types);
+static int		NativeMatchType(Tcl_Interp *interp,
+			    const char* nativeEntry, const char* nativeName,
+			    Tcl_GlobTypeData *types);
 
 /*
  *---------------------------------------------------------------------------
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 81e3af5..63167c6 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -54,11 +54,11 @@ static const char *const processors[NUMPROCESSORS] = {
 
 typedef struct {
     union {
-        unsigned int  dwOemId;
-        struct {
-            int wProcessorArchitecture;
-            int wReserved;
-        };
+	unsigned int  dwOemId;
+	struct {
+	    int wProcessorArchitecture;
+	    int wReserved;
+	};
     };
     unsigned int     dwPageSize;
     void *lpMinimumApplicationAddress;
@@ -860,15 +860,15 @@ TclpSetVariables(
     }
     Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_pkgPath", -1), NULL, pkgListObj, TCL_GLOBAL_ONLY);
     {
-        /* Some platforms build configure scripts expect ~ expansion so do that */
-        Tcl_Obj *origPaths;
-        Tcl_Obj *resolvedPaths;
-
-        origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);
-        resolvedPaths = TclResolveTildePathList(origPaths);
-        if (resolvedPaths != origPaths && resolvedPaths != NULL) {
-            Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL, resolvedPaths, TCL_GLOBAL_ONLY);
-        }
+	/* Some platforms build configure scripts expect ~ expansion so do that */
+	Tcl_Obj *origPaths;
+	Tcl_Obj *resolvedPaths;
+
+	origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);
+	resolvedPaths = TclResolveTildePathList(origPaths);
+	if (resolvedPaths != origPaths && resolvedPaths != NULL) {
+	    Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL, resolvedPaths, TCL_GLOBAL_ONLY);
+	}
     }
 
 #ifdef DJGPP
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 984ee2f..8ffea58 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -360,12 +360,12 @@ AlertSingleThread(
 	 */
 
 	if (tsdPtr->prevPtr) {
-    	    tsdPtr->prevPtr->nextPtr = tsdPtr->nextPtr;
+	    tsdPtr->prevPtr->nextPtr = tsdPtr->nextPtr;
 	} else {
-    	    waitingListPtr = tsdPtr->nextPtr;
+	    waitingListPtr = tsdPtr->nextPtr;
 	}
 	if (tsdPtr->nextPtr) {
-    	    tsdPtr->nextPtr->prevPtr = tsdPtr->prevPtr;
+	    tsdPtr->nextPtr->prevPtr = tsdPtr->prevPtr;
 	}
 	tsdPtr->nextPtr = tsdPtr->prevPtr = NULL;
 	tsdPtr->onList = 0;
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index ea1636e..a61c083 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -78,23 +78,23 @@ static int		SetupStdFile(TclFile file, int type);
  */
 
 static const Tcl_ChannelType pipeChannelType = {
-    "pipe",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,		/* Close proc. */
-    PipeInputProc,		/* Input proc. */
-    PipeOutputProc,		/* Output proc. */
-    NULL,			/* Seek proc. */
+    "pipe",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    PipeInputProc,
+    PipeOutputProc,
+    NULL,			/* Deprecated. */
     NULL,			/* Set option proc. */
     NULL,			/* Get option proc. */
-    PipeWatchProc,		/* Initialize notifier. */
-    PipeGetHandleProc,		/* Get OS handles out of channel. */
-    PipeClose2Proc,		/* close2proc. */
-    PipeBlockModeProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    NULL,			/* wide seek proc */
-    NULL,			/* thread action proc */
-    NULL			/* truncation */
+    PipeWatchProc,
+    PipeGetHandleProc,
+    PipeClose2Proc,
+    PipeBlockModeProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
+    NULL,			/* Seek proc. */
+    NULL,			/* Thread action proc. */
+    NULL			/* Truncation proc. */
 };
 
 /*
@@ -844,7 +844,7 @@ TclpCreateCommandChannel(
 				 * background exec). */
 {
     char channelName[16 + TCL_INTEGER_SPACE];
-    int channelId;
+    int fd;
     PipeState *statePtr = (PipeState *)Tcl_Alloc(sizeof(PipeState));
     int mode;
 
@@ -868,13 +868,13 @@ TclpCreateCommandChannel(
      */
 
     if (readFile) {
-	channelId = GetFd(readFile);
+	fd = GetFd(readFile);
     } else if (writeFile) {
-	channelId = GetFd(writeFile);
+	fd = GetFd(writeFile);
     } else if (errorFile) {
-	channelId = GetFd(errorFile);
+	fd = GetFd(errorFile);
     } else {
-	channelId = 0;
+	fd = 0;
     }
 
     /*
@@ -883,7 +883,7 @@ TclpCreateCommandChannel(
      * natural to use "pipe%d".
      */
 
-    snprintf(channelName, sizeof(channelName), "file%d", channelId);
+    snprintf(channelName, sizeof(channelName), "file%d", fd);
     statePtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
 	    statePtr, mode);
     return statePtr->channel;
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 78ed008..f2b15b2 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -63,8 +63,7 @@ struct TcpState {
      * Only needed for server sockets
      */
 
-    Tcl_TcpAcceptProc *acceptProc;
-                                /* Proc to call on accept. */
+    Tcl_TcpAcceptProc *acceptProc; /* Proc to call on accept. */
     void *acceptProcData;  /* The data for the accept proc. */
 
     /*
@@ -154,23 +153,23 @@ static Tcl_FileProc	WrapNotify;
  */
 
 static const Tcl_ChannelType tcpChannelType = {
-    "tcp",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v5 channel */
-    NULL,		/* Close proc. */
-    TcpInputProc,		/* Input proc. */
-    TcpOutputProc,		/* Output proc. */
+    "tcp",
+    TCL_CHANNEL_VERSION_5,
+    NULL,			/* Deprecated. */
+    TcpInputProc,
+    TcpOutputProc,
+    NULL,			/* Deprecated. */
+    TcpSetOptionProc,
+    TcpGetOptionProc,
+    TcpWatchProc,
+    TcpGetHandleProc,
+    TcpClose2Proc,
+    TcpBlockModeProc,
+    NULL,			/* Flush proc. */
+    NULL,			/* Bubbled event handler proc. */
     NULL,			/* Seek proc. */
-    TcpSetOptionProc,		/* Set option proc. */
-    TcpGetOptionProc,		/* Get option proc. */
-    TcpWatchProc,		/* Initialize notifier. */
-    TcpGetHandleProc,		/* Get OS handles out of channel. */
-    TcpClose2Proc,		/* Close2 proc. */
-    TcpBlockModeProc,		/* Set blocking or non-blocking mode.*/
-    NULL,			/* flush proc. */
-    NULL,			/* handler proc. */
-    NULL,			/* wide seek proc. */
-    TcpThreadActionProc,	/* thread action proc. */
-    NULL			/* truncate proc. */
+    TcpThreadActionProc,
+    NULL			/* Truncate proc. */
 };
 
 /*
@@ -204,8 +203,8 @@ printaddrinfo(
  *
  * InitializeHostName --
  *
- * 	This routine sets the process global value of the name of the local
- * 	host on which the process is running.
+ *	This routine sets the process global value of the name of the local
+ *	host on which the process is running.
  *
  * Results:
  *	None.
@@ -227,7 +226,7 @@ InitializeHostName(
 
     memset(&u, (int) 0, sizeof(struct utsname));
     if (uname(&u) >= 0) {				/* INTL: Native. */
-        hp = TclpGetHostByName(u.nodename);		/* INTL: Native. */
+	hp = TclpGetHostByName(u.nodename);		/* INTL: Native. */
 	if (hp == NULL) {
 	    /*
 	     * Sometimes the nodename is fully qualified, but gets truncated
@@ -246,11 +245,11 @@ InitializeHostName(
 		Tcl_Free(node);
 	    }
 	}
-        if (hp != NULL) {
+	if (hp != NULL) {
 	    native = hp->h_name;
-        } else {
+	} else {
 	    native = u.nodename;
-        }
+	}
     }
 #else /* !NO_UNAME */
     /*
@@ -370,8 +369,8 @@ TcpBlockModeProc(
 	SET_BITS(statePtr->flags, TCP_NONBLOCKING);
     }
     if (GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT)) {
-        statePtr->cachedBlocking = mode;
-        return 0;
+	statePtr->cachedBlocking = mode;
+	return 0;
     }
     if (TclUnixSetBlockingMode(statePtr->fds.fd, mode) < 0) {
 	return errno;
@@ -400,8 +399,8 @@ TcpBlockModeProc(
  *	    return any error code.
  *
  * Results:
- * 	0 if the connection has completed, -1 if still in progress or there is
- * 	an error.
+ *	0 if the connection has completed, -1 if still in progress or there is
+ *	an error.
  *
  * Side effects:
  *	Processes socket events off the system queue. May process
@@ -443,37 +442,37 @@ WaitForConnect(
      */
 
     if (GOT_BITS(statePtr->flags, TCP_ASYNC_TEST_MODE)
-            && !(errorCodePtr != NULL
-                    && !GOT_BITS(statePtr->flags, TCP_NONBLOCKING))) {
+	    && !(errorCodePtr != NULL
+		    && !GOT_BITS(statePtr->flags, TCP_NONBLOCKING))) {
 	*errorCodePtr = EWOULDBLOCK;
 	return -1;
     }
 
     if (errorCodePtr == NULL || GOT_BITS(statePtr->flags, TCP_NONBLOCKING)) {
-        timeout = 0;
+	timeout = 0;
     } else {
-        timeout = -1;
+	timeout = -1;
     }
     do {
-        if (TclUnixWaitForFile(statePtr->fds.fd,
-                TCL_WRITABLE | TCL_EXCEPTION, timeout) != 0) {
-            TcpConnect(NULL, statePtr);
-        }
-
-        /*
-         * Do this only once in the nonblocking case and repeat it until the
-         * socket is final when blocking.
-         */
+	if (TclUnixWaitForFile(statePtr->fds.fd,
+		TCL_WRITABLE | TCL_EXCEPTION, timeout) != 0) {
+	    TcpConnect(NULL, statePtr);
+	}
+
+	/*
+	 * Do this only once in the nonblocking case and repeat it until the
+	 * socket is final when blocking.
+	 */
     } while (timeout == -1 && GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT));
 
     if (errorCodePtr != NULL) {
-        if (GOT_BITS(statePtr->flags, TCP_ASYNC_PENDING)) {
-            *errorCodePtr = EAGAIN;
-            return -1;
-        } else if (statePtr->connectError != 0) {
-            *errorCodePtr = ENOTCONN;
-            return -1;
-        }
+	if (GOT_BITS(statePtr->flags, TCP_ASYNC_PENDING)) {
+	    *errorCodePtr = EAGAIN;
+	    return -1;
+	} else if (statePtr->connectError != 0) {
+	    *errorCodePtr = ENOTCONN;
+	    return -1;
+	}
     }
     return 0;
 }
@@ -627,10 +626,10 @@ TcpCloseProc(
 	fds = next;
     }
     if (statePtr->addrlist != NULL) {
-        freeaddrinfo(statePtr->addrlist);
+	freeaddrinfo(statePtr->addrlist);
     }
     if (statePtr->myaddrlist != NULL) {
-        freeaddrinfo(statePtr->myaddrlist);
+	freeaddrinfo(statePtr->myaddrlist);
     }
     Tcl_Free(statePtr);
     return errorCode;
@@ -706,7 +705,7 @@ IPv6AddressNeedsNumericRendering(
     struct in6_addr addr)
 {
     if (IN6_ARE_ADDR_EQUAL(&addr, &in6addr_any)) {
-        return 1;
+	return 1;
     }
 
     /*
@@ -715,11 +714,11 @@ IPv6AddressNeedsNumericRendering(
      */
 
     if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
-        return 0;
+	return 0;
     }
 
     return (addr.s6_addr[12] == 0 && addr.s6_addr[13] == 0
-            && addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
+	    && addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
 }
 #if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
 #pragma GCC diagnostic pop
@@ -738,7 +737,7 @@ TcpHostPortList(
     int flags = 0;
 
     getnameinfo(&addr.sa, salen, nhost, sizeof(nhost), nport, sizeof(nport),
-            NI_NUMERICHOST | NI_NUMERICSERV);
+	    NI_NUMERICHOST | NI_NUMERICSERV);
     Tcl_DStringAppendElement(dsPtr, nhost);
 
     /*
@@ -747,14 +746,14 @@ TcpHostPortList(
      */
 
     if (addr.sa.sa_family == AF_INET) {
-        if (addr.sa4.sin_addr.s_addr == INADDR_ANY) {
-            flags |= NI_NUMERICHOST;
-        }
+	if (addr.sa4.sin_addr.s_addr == INADDR_ANY) {
+	    flags |= NI_NUMERICHOST;
+	}
 #ifndef NEED_FAKE_RFC2553
     } else if (addr.sa.sa_family == AF_INET6) {
-        if (IPv6AddressNeedsNumericRendering(addr.sa6.sin6_addr)) {
-            flags |= NI_NUMERICHOST;
-        }
+	if (IPv6AddressNeedsNumericRendering(addr.sa6.sin6_addr)) {
+	    flags |= NI_NUMERICHOST;
+	}
 #endif /* NEED_FAKE_RFC2553 */
     }
 
@@ -763,22 +762,22 @@ TcpHostPortList(
      */
 
     if (interp != NULL &&
-            Tcl_GetVar2(interp, SUPPRESS_RDNS_VAR, NULL, 0) != NULL) {
-        flags |= NI_NUMERICHOST;
+	    Tcl_GetVar2(interp, SUPPRESS_RDNS_VAR, NULL, 0) != NULL) {
+	flags |= NI_NUMERICHOST;
     }
     if (getnameinfo(&addr.sa, salen, host, sizeof(host), NULL, 0,
-            flags) == 0) {
-        /*
-         * Reverse mapping worked.
-         */
+	    flags) == 0) {
+	/*
+	 * Reverse mapping worked.
+	 */
 
-        Tcl_DStringAppendElement(dsPtr, host);
+	Tcl_DStringAppendElement(dsPtr, host);
     } else {
-        /*
-         * Reverse mapping failed - use the numeric rep once more.
-         */
+	/*
+	 * Reverse mapping failed - use the numeric rep once more.
+	 */
 
-        Tcl_DStringAppendElement(dsPtr, nhost);
+	Tcl_DStringAppendElement(dsPtr, nhost);
     }
     Tcl_DStringAppendElement(dsPtr, nport);
 }
@@ -907,25 +906,25 @@ TcpGetOptionProc(
 	socklen_t optlen = sizeof(int);
 
 	WaitForConnect(statePtr, NULL);
-        if (GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT)) {
-            /*
-             * Suppress errors as long as we are not done.
-             */
-
-            errno = 0;
-        } else if (statePtr->connectError != 0) {
-            errno = statePtr->connectError;
-            statePtr->connectError = 0;
-        } else {
-            int err;
-
-            getsockopt(statePtr->fds.fd, SOL_SOCKET, SO_ERROR, (char *) &err,
-                    &optlen);
-            errno = err;
-        }
-        if (errno != 0) {
+	if (GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT)) {
+	    /*
+	     * Suppress errors as long as we are not done.
+	     */
+
+	    errno = 0;
+	} else if (statePtr->connectError != 0) {
+	    errno = statePtr->connectError;
+	    statePtr->connectError = 0;
+	} else {
+	    int err;
+
+	    getsockopt(statePtr->fds.fd, SOL_SOCKET, SO_ERROR, (char *) &err,
+		    &optlen);
+	    errno = err;
+	}
+	if (errno != 0) {
 	    Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(errno), TCL_INDEX_NONE);
-        }
+	}
 	return TCL_OK;
     }
 
@@ -934,13 +933,13 @@ TcpGetOptionProc(
 	WaitForConnect(statePtr, NULL);
 	Tcl_DStringAppend(dsPtr,
 		GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT) ? "1" : "0", TCL_INDEX_NONE);
-        return TCL_OK;
+	return TCL_OK;
     }
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'p') &&
 	    (strncmp(optionName, "-peername", len) == 0))) {
-        address peername;
-        socklen_t size = sizeof(peername);
+	address peername;
+	socklen_t size = sizeof(peername);
 
 	WaitForConnect(statePtr, NULL);
 	if (GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT)) {
@@ -963,11 +962,11 @@ TcpGetOptionProc(
 		Tcl_DStringAppendElement(dsPtr, "-peername");
 		Tcl_DStringStartSublist(dsPtr);
 	    }
-            TcpHostPortList(interp, dsPtr, peername, size);
+	    TcpHostPortList(interp, dsPtr, peername, size);
 	    if (len) {
-                return TCL_OK;
-            }
-            Tcl_DStringEndSublist(dsPtr);
+		return TCL_OK;
+	    }
+	    Tcl_DStringEndSublist(dsPtr);
 	} else {
 	    /*
 	     * getpeername failed - but if we were asked for all the options
@@ -979,7 +978,7 @@ TcpGetOptionProc(
 	    if (len) {
 		if (interp) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                            "can't get peername: %s",
+			    "can't get peername: %s",
 			    Tcl_PosixError(interp)));
 		}
 		return TCL_ERROR;
@@ -1004,7 +1003,7 @@ TcpGetOptionProc(
 	     * In async connect output an empty string
 	     */
 
-            found = 1;
+	    found = 1;
 	} else {
 	    for (fds = &statePtr->fds; fds != NULL; fds = fds->next) {
 		size = sizeof(sockname);
@@ -1014,16 +1013,16 @@ TcpGetOptionProc(
 		}
 	    }
 	}
-        if (found) {
-            if (len) {
-                return TCL_OK;
-            }
-            Tcl_DStringEndSublist(dsPtr);
-        } else {
-            if (interp) {
-                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                        "can't get sockname: %s", Tcl_PosixError(interp)));
-            }
+	if (found) {
+	    if (len) {
+		return TCL_OK;
+	    }
+	    Tcl_DStringEndSublist(dsPtr);
+	} else {
+	    if (interp) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"can't get sockname: %s", Tcl_PosixError(interp)));
+	    }
 	    return TCL_ERROR;
 	}
     }
@@ -1070,7 +1069,7 @@ TcpGetOptionProc(
 
     if (len > 0) {
 	return Tcl_BadChannelOption(interp, optionName,
-                "connecting keepalive nodelay peername sockname");
+		"connecting keepalive nodelay peername sockname");
     }
 
     return TCL_OK;
@@ -1177,22 +1176,22 @@ TcpWatchProc(
     TcpState *statePtr = (TcpState *)instanceData;
 
     if (statePtr->acceptProc != NULL) {
-        /*
-         * Make sure we don't mess with server sockets since they will never
-         * be readable or writable at the Tcl level. This keeps Tcl scripts
-         * from interfering with the -accept behavior (bug #3394732).
-         */
+	/*
+	 * Make sure we don't mess with server sockets since they will never
+	 * be readable or writable at the Tcl level. This keeps Tcl scripts
+	 * from interfering with the -accept behavior (bug #3394732).
+	 */
 
-    	return;
+	return;
     }
 
     if (GOT_BITS(statePtr->flags, TCP_ASYNC_PENDING)) {
-        /*
-         * Async sockets use a FileHandler internally while connecting, so we
-         * need to cache this request until the connection has succeeded.
-         */
+	/*
+	 * Async sockets use a FileHandler internally while connecting, so we
+	 * need to cache this request until the connection has succeeded.
+	 */
 
-        statePtr->filehandlers = mask;
+	statePtr->filehandlers = mask;
     } else if (mask) {
 
 	/*
@@ -1314,14 +1313,14 @@ TcpConnect(
     static const int reuseaddr = 1;
 
     if (async_callback) {
-        goto reenter;
+	goto reenter;
     }
 
     for (statePtr->addr = statePtr->addrlist; statePtr->addr != NULL;
-            statePtr->addr = statePtr->addr->ai_next) {
-        for (statePtr->myaddr = statePtr->myaddrlist;
-                statePtr->myaddr != NULL;
-                statePtr->myaddr = statePtr->myaddr->ai_next) {
+	    statePtr->addr = statePtr->addr->ai_next) {
+	for (statePtr->myaddr = statePtr->myaddrlist;
+		statePtr->myaddr != NULL;
+		statePtr->myaddr = statePtr->myaddr->ai_next) {
 	    /*
 	     * No need to try combinations of local and remote addresses of
 	     * different families.
@@ -1331,19 +1330,19 @@ TcpConnect(
 		continue;
 	    }
 
-            /*
-             * Close the socket if it is still open from the last unsuccessful
-             * iteration.
-             */
+	    /*
+	     * Close the socket if it is still open from the last unsuccessful
+	     * iteration.
+	     */
 
-            if (statePtr->fds.fd >= 0) {
+	    if (statePtr->fds.fd >= 0) {
 		close(statePtr->fds.fd);
 		statePtr->fds.fd = -1;
-                errno = 0;
+		errno = 0;
 	    }
 
 	    statePtr->fds.fd = socket(statePtr->addr->ai_family, SOCK_STREAM,
-                    0);
+		    0);
 	    if (statePtr->fds.fd < 0) {
 		continue;
 	    }
@@ -1362,28 +1361,28 @@ TcpConnect(
 	    TclSockMinimumBuffers(INT2PTR(statePtr->fds.fd), SOCKET_BUFSIZE);
 
 	    if (async) {
-                ret = TclUnixSetBlockingMode(statePtr->fds.fd,
-                        TCL_MODE_NONBLOCKING);
-                if (ret < 0) {
-                    continue;
-                }
-            }
-
-            /*
-             * Must reset the error variable here, before we use it for the
-             * first time in this iteration.
-             */
-
-            error = 0;
-
-            (void) setsockopt(statePtr->fds.fd, SOL_SOCKET, SO_REUSEADDR,
-                    (char *) &reuseaddr, sizeof(reuseaddr));
-            ret = bind(statePtr->fds.fd, statePtr->myaddr->ai_addr,
-                    statePtr->myaddr->ai_addrlen);
-            if (ret < 0) {
-                error = errno;
-                continue;
-            }
+		ret = TclUnixSetBlockingMode(statePtr->fds.fd,
+			TCL_MODE_NONBLOCKING);
+		if (ret < 0) {
+		    continue;
+		}
+	    }
+
+	    /*
+	     * Must reset the error variable here, before we use it for the
+	     * first time in this iteration.
+	     */
+
+	    error = 0;
+
+	    (void) setsockopt(statePtr->fds.fd, SOL_SOCKET, SO_REUSEADDR,
+		    (char *) &reuseaddr, sizeof(reuseaddr));
+	    ret = bind(statePtr->fds.fd, statePtr->myaddr->ai_addr,
+		    statePtr->myaddr->ai_addrlen);
+	    if (ret < 0) {
+		error = errno;
+		continue;
+	    }
 
 	    /*
 	     * Attempt to connect. The connect may fail at present with an
@@ -1393,35 +1392,35 @@ TcpConnect(
 	     */
 
 	    ret = connect(statePtr->fds.fd, statePtr->addr->ai_addr,
-                        statePtr->addr->ai_addrlen);
-            if (ret < 0) {
-                error = errno;
-            }
+			statePtr->addr->ai_addrlen);
+	    if (ret < 0) {
+		error = errno;
+	    }
 	    if (ret < 0 && errno == EINPROGRESS) {
-                Tcl_CreateFileHandler(statePtr->fds.fd,
-                        TCL_WRITABLE | TCL_EXCEPTION, TcpAsyncCallback,
-                        statePtr);
-                errno = EWOULDBLOCK;
-                SET_BITS(statePtr->flags, TCP_ASYNC_PENDING);
-                return TCL_OK;
-
-            reenter:
-                CLEAR_BITS(statePtr->flags, TCP_ASYNC_PENDING);
-                Tcl_DeleteFileHandler(statePtr->fds.fd);
-
-                /*
-                 * Read the error state from the socket to see if the async
-                 * connection has succeeded or failed. As this clears the
-                 * error condition, we cache the status in the socket state
-                 * struct for later retrieval by [fconfigure -error].
-                 */
-
-                optlen = sizeof(int);
-
-                getsockopt(statePtr->fds.fd, SOL_SOCKET, SO_ERROR,
-                        (char *) &error, &optlen);
-                errno = error;
-            }
+		Tcl_CreateFileHandler(statePtr->fds.fd,
+			TCL_WRITABLE | TCL_EXCEPTION, TcpAsyncCallback,
+			statePtr);
+		errno = EWOULDBLOCK;
+		SET_BITS(statePtr->flags, TCP_ASYNC_PENDING);
+		return TCL_OK;
+
+	    reenter:
+		CLEAR_BITS(statePtr->flags, TCP_ASYNC_PENDING);
+		Tcl_DeleteFileHandler(statePtr->fds.fd);
+
+		/*
+		 * Read the error state from the socket to see if the async
+		 * connection has succeeded or failed. As this clears the
+		 * error condition, we cache the status in the socket state
+		 * struct for later retrieval by [fconfigure -error].
+		 */
+
+		optlen = sizeof(int);
+
+		getsockopt(statePtr->fds.fd, SOL_SOCKET, SO_ERROR,
+			(char *) &error, &optlen);
+		errno = error;
+	    }
 	    if (error == 0) {
 		goto out;
 	    }
@@ -1432,43 +1431,43 @@ TcpConnect(
     statePtr->connectError = error;
     CLEAR_BITS(statePtr->flags, TCP_ASYNC_CONNECT);
     if (async_callback) {
-        /*
-         * An asynchonous connection has finally succeeded or failed.
-         */
-
-        TcpWatchProc(statePtr, statePtr->filehandlers);
-        TclUnixSetBlockingMode(statePtr->fds.fd, statePtr->cachedBlocking);
-
-        if (error != 0) {
-            SET_BITS(statePtr->flags, TCP_ASYNC_FAILED);
-        }
-
-        /*
-         * We need to forward the writable event that brought us here, because
-         * upon reading of getsockopt(SO_ERROR), at least some OSes clear the
-         * writable state from the socket, and so a subsequent select() on
-         * behalf of a script level [fileevent] would not fire. It doesn't
-         * hurt that this is also called in the successful case and will save
-         * the event mechanism one roundtrip through select().
-         */
+	/*
+	 * An asynchonous connection has finally succeeded or failed.
+	 */
+
+	TcpWatchProc(statePtr, statePtr->filehandlers);
+	TclUnixSetBlockingMode(statePtr->fds.fd, statePtr->cachedBlocking);
+
+	if (error != 0) {
+	    SET_BITS(statePtr->flags, TCP_ASYNC_FAILED);
+	}
+
+	/*
+	 * We need to forward the writable event that brought us here, because
+	 * upon reading of getsockopt(SO_ERROR), at least some OSes clear the
+	 * writable state from the socket, and so a subsequent select() on
+	 * behalf of a script level [fileevent] would not fire. It doesn't
+	 * hurt that this is also called in the successful case and will save
+	 * the event mechanism one roundtrip through select().
+	 */
 
 	if (statePtr->cachedBlocking == TCL_MODE_NONBLOCKING) {
 	    Tcl_NotifyChannel(statePtr->channel, TCL_WRITABLE);
 	}
     }
     if (error != 0) {
-        /*
-         * Failure for either a synchronous connection, or an async one that
-         * failed before it could enter background mode, e.g. because an
-         * invalid -myaddr was given.
-         */
-
-        if (interp != NULL) {
-            errno = error;
-            Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                    "couldn't open socket: %s", Tcl_PosixError(interp)));
-        }
-        return TCL_ERROR;
+	/*
+	 * Failure for either a synchronous connection, or an async one that
+	 * failed before it could enter background mode, e.g. because an
+	 * invalid -myaddr was given.
+	 */
+
+	if (interp != NULL) {
+	    errno = error;
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "couldn't open socket: %s", Tcl_PosixError(interp)));
+	}
+	return TCL_ERROR;
     }
     return TCL_OK;
 }
@@ -1511,16 +1510,16 @@ Tcl_OpenTcpClient(
      */
 
     if (!TclCreateSocketAddress(interp, &addrlist, host, port, 0, &errorMsg)
-            || !TclCreateSocketAddress(interp, &myaddrlist, myaddr, myport, 1,
-                    &errorMsg)) {
-        if (addrlist != NULL) {
-            freeaddrinfo(addrlist);
-        }
-        if (interp != NULL) {
-            Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                    "couldn't open socket: %s", errorMsg));
-        }
-        return NULL;
+	    || !TclCreateSocketAddress(interp, &myaddrlist, myaddr, myport, 1,
+		    &errorMsg)) {
+	if (addrlist != NULL) {
+	    freeaddrinfo(addrlist);
+	}
+	if (interp != NULL) {
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "couldn't open socket: %s", errorMsg));
+	}
+	return NULL;
     }
 
     /*
@@ -1540,14 +1539,14 @@ Tcl_OpenTcpClient(
      */
 
     if (TcpConnect(interp, statePtr) != TCL_OK) {
-        TcpCloseProc(statePtr, NULL);
-        return NULL;
+	TcpCloseProc(statePtr, NULL);
+	return NULL;
     }
 
     snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, PTR2INT(statePtr));
 
     statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            statePtr, TCL_READABLE | TCL_WRITABLE);
+	    statePtr, TCL_READABLE | TCL_WRITABLE);
     if (Tcl_SetChannelOption(interp, statePtr->channel, "-translation",
 	    "auto crlf") == TCL_ERROR) {
 	Tcl_CloseEx(NULL, statePtr->channel, 0);
@@ -1577,7 +1576,7 @@ Tcl_MakeTcpClientChannel(
     void *sock)		/* The socket to wrap up into a channel. */
 {
     return (Tcl_Channel) TclpMakeTcpClientChannelMode(sock,
-            TCL_READABLE | TCL_WRITABLE);
+	    TCL_READABLE | TCL_WRITABLE);
 }
 
 /*
@@ -1684,17 +1683,17 @@ Tcl_OpenTcpServerEx(
 
  repeat:
     if (retry > 0) {
-        if (statePtr != NULL) {
-            TcpCloseProc(statePtr, NULL);
-            statePtr = NULL;
-        }
-        if (addrlist != NULL) {
-            freeaddrinfo(addrlist);
-            addrlist = NULL;
-        }
-        if (retry >= MAXRETRY) {
-            goto error;
-        }
+	if (statePtr != NULL) {
+	    TcpCloseProc(statePtr, NULL);
+	    statePtr = NULL;
+	}
+	if (addrlist != NULL) {
+	    freeaddrinfo(addrlist);
+	    addrlist = NULL;
+	}
+	if (retry >= MAXRETRY) {
+	    goto error;
+	}
     }
     retry++;
     chosenport = 0;
@@ -1705,14 +1704,14 @@ Tcl_OpenTcpServerEx(
     }
 
     if (!TclCreateSocketAddress(interp, &addrlist, myHost, port, 1,
-            &errorMsg)) {
+	    &errorMsg)) {
 	my_errno = errno;
 	goto error;
     }
 
     for (addrPtr = addrlist; addrPtr != NULL; addrPtr = addrPtr->ai_next) {
 	sock = socket(addrPtr->ai_family, addrPtr->ai_socktype,
-                addrPtr->ai_protocol);
+		addrPtr->ai_protocol);
 	if (sock == -1) {
 	    if (howfar < SOCKET) {
 		howfar = SOCKET;
@@ -1760,100 +1759,100 @@ Tcl_OpenTcpServerEx(
 #endif
 	}
 
-        /*
-         * Make sure we use the same port number when opening two server
-         * sockets for IPv4 and IPv6 on a random port.
-         *
-         * As sockaddr_in6 uses the same offset and size for the port member
-         * as sockaddr_in, we can handle both through the IPv4 API.
-         */
+	/*
+	 * Make sure we use the same port number when opening two server
+	 * sockets for IPv4 and IPv6 on a random port.
+	 *
+	 * As sockaddr_in6 uses the same offset and size for the port member
+	 * as sockaddr_in, we can handle both through the IPv4 API.
+	 */
 
 	if (port == 0 && chosenport != 0) {
 	    ((struct sockaddr_in *) addrPtr->ai_addr)->sin_port =
-                    htons(chosenport);
+		    htons(chosenport);
 	}
 
 #ifdef IPV6_V6ONLY
 	/*
-         * Missing on: Solaris 2.8
-         */
+	 * Missing on: Solaris 2.8
+	 */
 
-        if (addrPtr->ai_family == AF_INET6) {
-            int v6only = 1;
+	if (addrPtr->ai_family == AF_INET6) {
+	    int v6only = 1;
 
-            (void) setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                    &v6only, sizeof(v6only));
-        }
+	    (void) setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+		    &v6only, sizeof(v6only));
+	}
 #endif /* IPV6_V6ONLY */
 
 	status = bind(sock, addrPtr->ai_addr, addrPtr->ai_addrlen);
-        if (status == -1) {
+	if (status == -1) {
 	    if (howfar < BIND) {
 		howfar = BIND;
 		my_errno = errno;
 	    }
-            close(sock);
-            sock = -1;
-            if (port == 0 && errno == EADDRINUSE) {
-                goto repeat;
-            }
-            continue;
-        }
-        if (port == 0 && chosenport == 0) {
-            address sockname;
-            socklen_t namelen = sizeof(sockname);
-
-            /*
-             * Synchronize port numbers when binding to port 0 of multiple
-             * addresses.
-             */
-
-            if (getsockname(sock, &sockname.sa, &namelen) >= 0) {
-                chosenport = ntohs(sockname.sa4.sin_port);
-            }
-        }
-        if (backlog < 0) {
-            backlog = SOMAXCONN;
-        }
-        status = listen(sock, backlog);
-        if (status < 0) {
+	    close(sock);
+	    sock = -1;
+	    if (port == 0 && errno == EADDRINUSE) {
+		goto repeat;
+	    }
+	    continue;
+	}
+	if (port == 0 && chosenport == 0) {
+	    address sockname;
+	    socklen_t namelen = sizeof(sockname);
+
+	    /*
+	     * Synchronize port numbers when binding to port 0 of multiple
+	     * addresses.
+	     */
+
+	    if (getsockname(sock, &sockname.sa, &namelen) >= 0) {
+		chosenport = ntohs(sockname.sa4.sin_port);
+	    }
+	}
+	if (backlog < 0) {
+	    backlog = SOMAXCONN;
+	}
+	status = listen(sock, backlog);
+	if (status < 0) {
 	    if (howfar < LISTEN) {
 		howfar = LISTEN;
 		my_errno = errno;
 	    }
-            close(sock);
-            sock = -1;
-            if (port == 0 && errno == EADDRINUSE) {
-                goto repeat;
-            }
-            continue;
-        }
-        if (statePtr == NULL) {
-            /*
-             * Allocate a new TcpState for this socket.
-             */
-
-            statePtr = (TcpState *)Tcl_Alloc(sizeof(TcpState));
-            memset(statePtr, 0, sizeof(TcpState));
-            statePtr->acceptProc = acceptProc;
-            statePtr->acceptProcData = acceptProcData;
-            snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, PTR2INT(statePtr));
-            newfds = &statePtr->fds;
-        } else {
-            newfds = (TcpFdList *)Tcl_Alloc(sizeof(TcpFdList));
-            memset(newfds, (int) 0, sizeof(TcpFdList));
-            fds->next = newfds;
-        }
-        newfds->fd = sock;
-        newfds->statePtr = statePtr;
-        fds = newfds;
-
-        /*
-         * Set up the callback mechanism for accepting connections from new
-         * clients.
-         */
-
-        Tcl_CreateFileHandler(sock, TCL_READABLE, TcpAccept, fds);
+	    close(sock);
+	    sock = -1;
+	    if (port == 0 && errno == EADDRINUSE) {
+		goto repeat;
+	    }
+	    continue;
+	}
+	if (statePtr == NULL) {
+	    /*
+	     * Allocate a new TcpState for this socket.
+	     */
+
+	    statePtr = (TcpState *)Tcl_Alloc(sizeof(TcpState));
+	    memset(statePtr, 0, sizeof(TcpState));
+	    statePtr->acceptProc = acceptProc;
+	    statePtr->acceptProcData = acceptProcData;
+	    snprintf(channelName, sizeof(channelName), SOCK_TEMPLATE, PTR2INT(statePtr));
+	    newfds = &statePtr->fds;
+	} else {
+	    newfds = (TcpFdList *)Tcl_Alloc(sizeof(TcpFdList));
+	    memset(newfds, (int) 0, sizeof(TcpFdList));
+	    fds->next = newfds;
+	}
+	newfds->fd = sock;
+	newfds->statePtr = statePtr;
+	fds = newfds;
+
+	/*
+	 * Set up the callback mechanism for accepting connections from new
+	 * clients.
+	 */
+
+	Tcl_CreateFileHandler(sock, TCL_READABLE, TcpAccept, fds);
     }
 
   error:
@@ -1866,15 +1865,15 @@ Tcl_OpenTcpServerEx(
 	return statePtr->channel;
     }
     if (interp != NULL) {
-        Tcl_Obj *errorObj = Tcl_NewStringObj("couldn't open socket: ", TCL_INDEX_NONE);
+	Tcl_Obj *errorObj = Tcl_NewStringObj("couldn't open socket: ", TCL_INDEX_NONE);
 
 	if (errorMsg == NULL) {
-            errno = my_errno;
-            Tcl_AppendToObj(errorObj, Tcl_PosixError(interp), TCL_INDEX_NONE);
-        } else {
+	    errno = my_errno;
+	    Tcl_AppendToObj(errorObj, Tcl_PosixError(interp), TCL_INDEX_NONE);
+	} else {
 	    Tcl_AppendToObj(errorObj, errorMsg, TCL_INDEX_NONE);
 	}
-        Tcl_SetObjResult(interp, errorObj);
+	Tcl_SetObjResult(interp, errorObj);
     }
     if (sock != -1) {
 	close(sock);
@@ -1938,9 +1937,9 @@ TcpAccept(
 
     if (fds->statePtr->acceptProc != NULL) {
 	getnameinfo(&addr.sa, len, host, sizeof(host), port, sizeof(port),
-                NI_NUMERICHOST|NI_NUMERICSERV);
+		NI_NUMERICHOST|NI_NUMERICSERV);
 	fds->statePtr->acceptProc(fds->statePtr->acceptProcData,
-                newSockState->channel, host, atoi(port));
+		newSockState->channel, host, atoi(port));
     }
 }
 
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index b204c77..26c590d 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -549,7 +549,7 @@ TestalarmCmd(
  *	None.
  *
  * Side effects:
- * 	Calls the Tcl Async handler.
+ *	Calls the Tcl Async handler.
  *
  *----------------------------------------------------------------------
  */
@@ -566,7 +566,7 @@ AlarmHandler(
  *
  * TestgotsigCmd --
  *
- * 	Verify the signal was handled after the testalarm command.
+ *	Verify the signal was handled after the testalarm command.
  *
  * Results:
  *	None.
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 20b9a67..29146aa 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -246,7 +246,7 @@ TclpWideClicksToNanoseconds(
  *	and back.
  *
  * Results:
- * 	1 click in microseconds as double.
+ *	1 click in microseconds as double.
  *
  * Side effects:
  *	None.