diff options
| author | stanton <stanton> | 1999-04-15 22:38:46 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-04-15 22:38:46 (GMT) |
| commit | 743017523886608c1403479b0676d469b8f998ac (patch) | |
| tree | e29ecad719da73c67d437be2a057cc01dca684e9 /mac/tclMacChan.c | |
| parent | ae56f9fc8840d99814f8fc8986fe6445ec9a57e6 (diff) | |
| download | tcl-743017523886608c1403479b0676d469b8f998ac.zip tcl-743017523886608c1403479b0676d469b8f998ac.tar.gz tcl-743017523886608c1403479b0676d469b8f998ac.tar.bz2 | |
* Merge 8.0.5 changes:
- Mac changes for final release
- Minor fixes to tools configure file
* win/tclWinSock.c: Apply patch to allow write access to a socket
if FD_WRITE is sent but FD_CONNECT is not. Some strange problem
with either Win32 or a socket driver. [Bug: 1664 1776]
Diffstat (limited to 'mac/tclMacChan.c')
| -rw-r--r-- | mac/tclMacChan.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mac/tclMacChan.c b/mac/tclMacChan.c index 38be0a4..fc53f42 100644 --- a/mac/tclMacChan.c +++ b/mac/tclMacChan.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacChan.c,v 1.4 1999/03/10 05:52:51 stanton Exp $ + * RCS: @(#) $Id: tclMacChan.c,v 1.5 1999/04/15 22:38:46 stanton Exp $ */ #include "tclInt.h" @@ -87,6 +87,12 @@ typedef struct FileEvent { * pointer. */ } FileEvent; +/* + * This is defined in tclMacSerial.c. + */ + +EXTERN Tcl_Channel TclMacOpenSerialChannel _ANSI_ARGS_((Tcl_Interp *interp, + char *fileName, int *errorCode)); /* * Static routines for this file: @@ -761,13 +767,17 @@ TclpOpenFileChannel( int mode; char *nativeName; Tcl_DString buffer; - int errorCode; + int errorCode, port = 0; mode = GetOpenMode(interp, modeString); if (mode == -1) { return NULL; } + /* + * Look for the magic cookies that refer to the modem ports. + */ + nativeName = Tcl_TranslateFileName(interp, fileName, &buffer); if (nativeName == NULL) { return NULL; @@ -775,7 +785,7 @@ TclpOpenFileChannel( chan = OpenFileChannel(nativeName, mode, permissions, &errorCode); Tcl_DStringFree(&buffer); - + if (chan == NULL) { Tcl_SetErrno(errorCode); if (interp != (Tcl_Interp *) NULL) { |