1 files changed, 28 insertions, 23 deletions

diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 2dc5f46..2314ba3 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -277,7 +277,7 @@ FileInputProc(
      * nonblocking, the read will never block.
      */
 
-    bytesRead = read(fsPtr->fd, buf, (size_t) toRead);
+    bytesRead = read(fsPtr->fd, buf, toRead);
     if (bytesRead > -1) {
 	return bytesRead;
     }
@@ -324,7 +324,7 @@ FileOutputProc(
 
 	return 0;
     }
-    written = write(fsPtr->fd, buf, (size_t) toWrite);
+    written = write(fsPtr->fd, buf, toWrite);
     if (written > -1) {
 	return written;
     }
@@ -371,7 +371,7 @@ FileCloseProc(
 	    errorCode = errno;
 	}
     }
-    ckfree(fsPtr);
+    Tcl_Free(fsPtr);
     return errorCode;
 }
 
@@ -646,7 +646,7 @@ TtySetOptionProc(
     const char *value)		/* New value for option. */
 {
     TtyState *fsPtr = (TtyState *)instanceData;
-    unsigned int len, vlen;
+    size_t len, vlen;
     TtyAttrs tty;
     int argc;
     const char **argv;
@@ -731,7 +731,7 @@ TtySetOptionProc(
 			" two elements with each a single 8-bit character", -1));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "XCHAR", NULL);
 	    }
-	    ckfree(argv);
+	    Tcl_Free(argv);
 	    return TCL_ERROR;
 	}
 
@@ -754,7 +754,7 @@ TtySetOptionProc(
 	    }
 	    iostate.c_cc[VSTOP] = character;
 	}
-	ckfree(argv);
+	Tcl_Free(argv);
 
 	tcsetattr(fsPtr->fileState.fd, TCSADRAIN, &iostate);
 	return TCL_OK;
@@ -796,14 +796,14 @@ TtySetOptionProc(
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE",
 			"VALUE", NULL);
 	    }
-	    ckfree(argv);
+	    Tcl_Free(argv);
 	    return TCL_ERROR;
 	}
 
 	ioctl(fsPtr->fileState.fd, TIOCMGET, &control);
 	for (i = 0; i < argc-1; i += 2) {
 	    if (Tcl_GetBoolean(interp, argv[i+1], &flag) == TCL_ERROR) {
-		ckfree(argv);
+		Tcl_Free(argv);
 		return TCL_ERROR;
 	    }
 	    if (Tcl_UtfNcasecmp(argv[i], "DTR", strlen(argv[i])) == 0) {
@@ -827,7 +827,7 @@ TtySetOptionProc(
 		}
 #else /* TIOCSBRK & TIOCCBRK */
 		UNSUPPORTED_OPTION("-ttycontrol BREAK");
-		ckfree(argv);
+		Tcl_Free(argv);
 		return TCL_ERROR;
 #endif /* TIOCSBRK & TIOCCBRK */
 	    } else {
@@ -838,13 +838,13 @@ TtySetOptionProc(
 		    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "FCONFIGURE",
 			"VALUE", NULL);
 		}
-		ckfree(argv);
+		Tcl_Free(argv);
 		return TCL_ERROR;
 	    }
 	} /* -ttycontrol options loop */
 
 	ioctl(fsPtr->fileState.fd, TIOCMSET, &control);
-	ckfree(argv);
+	Tcl_Free(argv);
 	return TCL_OK;
 #else /* TIOCMGET&TIOCMSET */
 	UNSUPPORTED_OPTION("-ttycontrol");
@@ -985,7 +985,7 @@ TtyGetOptionProc(
     Tcl_DString *dsPtr)		/* Where to store value(s). */
 {
     TtyState *fsPtr = (TtyState *)instanceData;
-    unsigned int len;
+    size_t len;
     char buf[3*TCL_INTEGER_SPACE + 16];
     int valid = 0;		/* Flag if valid option parsed. */
     struct termios iostate;
@@ -1713,7 +1713,7 @@ TclpOpenFileChannel(
 	sprintf(channelName, "file%d", fd);
     }
 
-    fsPtr = (TtyState *)ckalloc(sizeof(TtyState));
+    fsPtr = (TtyState *)Tcl_Alloc(sizeof(TtyState));
     fsPtr->fileState.validMask = channelPermissions | TCL_EXCEPTION;
     fsPtr->fileState.fd = fd;
 #ifdef SUPPORTS_TTY
@@ -1772,32 +1772,37 @@ Tcl_MakeFileChannel(
     char channelName[16 + TCL_INTEGER_SPACE];
     int fd = PTR2INT(handle);
     const Tcl_ChannelType *channelTypePtr;
-    struct sockaddr sockaddr;
-    socklen_t sockaddrLen = sizeof(sockaddr);
+    struct stat buf;
 
     if (mode == 0) {
 	return NULL;
     }
 
-    sockaddr.sa_family = AF_UNSPEC;
-
 #ifdef SUPPORTS_TTY
     if (isatty(fd)) {
 	channelTypePtr = &ttyChannelType;
 	sprintf(channelName, "serial%d", fd);
     } else
 #endif /* SUPPORTS_TTY */
-    if ((getsockname(fd, (struct sockaddr *) &sockaddr, &sockaddrLen) == 0)
-	    && (sockaddrLen > 0)
-	    && (sockaddr.sa_family == AF_INET
-		    || sockaddr.sa_family == AF_INET6)) {
-	return (Tcl_Channel)TclpMakeTcpClientChannelMode(INT2PTR(fd), mode);
+    if (fstat(fd, &buf) == 0 && S_ISSOCK(buf.st_mode)) {
+	struct sockaddr sockaddr;
+	socklen_t sockaddrLen = sizeof(sockaddr);
+
+	sockaddr.sa_family = AF_UNSPEC;
+	if ((getsockname(fd, (struct sockaddr *)&sockaddr, &sockaddrLen) == 0)
+		&& (sockaddrLen > 0)
+		&& (sockaddr.sa_family == AF_INET
+			|| sockaddr.sa_family == AF_INET6)) {
+	    return (Tcl_Channel)TclpMakeTcpClientChannelMode(INT2PTR(fd), mode);
+	}
+	goto normalChannelAfterAll;
     } else {
+    normalChannelAfterAll:
 	channelTypePtr = &fileChannelType;
 	sprintf(channelName, "file%d", fd);
     }
 
-    fsPtr = (TtyState *)ckalloc(sizeof(TtyState));
+    fsPtr = (TtyState *)Tcl_Alloc(sizeof(TtyState));
     fsPtr->fileState.fd = fd;
     fsPtr->fileState.validMask = mode | TCL_EXCEPTION;
     fsPtr->fileState.channel = Tcl_CreateChannel(channelTypePtr, channelName,