diff options
| author | oehhar <harald.oehlmann@elmicron.de> | 2014-12-17 07:53:41 (GMT) |
|---|---|---|
| committer | oehhar <harald.oehlmann@elmicron.de> | 2014-12-17 07:53:41 (GMT) |
| commit | 691e34c6ccbee85bbd91e420504983345029d5ea (patch) | |
| tree | 53724883281fc684d74af9de3e4a0a1bfd56e946 /unix/tclUnixChan.c | |
| parent | a9606871f5ddb7d6a8cd69f3fa0c41fe8b3c0396 (diff) | |
| parent | 2933029b8c2dfc2e4a8bd89cacad8aa53099d5d4 (diff) | |
| download | tcl-691e34c6ccbee85bbd91e420504983345029d5ea.zip tcl-691e34c6ccbee85bbd91e420504983345029d5ea.tar.gz tcl-691e34c6ccbee85bbd91e420504983345029d5ea.tar.bz2 | |
Merge trunk
Diffstat (limited to 'unix/tclUnixChan.c')
| -rw-r--r-- | unix/tclUnixChan.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index fdc9d1d..a1fe090 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -792,7 +792,7 @@ TtySetOptionProc( * * Results: * A standard Tcl result. Also sets the supplied DString to the string - * value of the option(s) returned. Sets error message if needed + * value of the option(s) returned. Sets error message if needed * (by calling Tcl_BadChannelOption). * *---------------------------------------------------------------------- @@ -1201,7 +1201,7 @@ TtyParseMode( char parity; const char *bad = "bad value for -mode"; - i = sscanf(mode, "%d,%c,%d,%d%n", + i = sscanf(mode, "%d,%c,%d,%d%n", &ttyPtr->baud, &parity, &ttyPtr->data, @@ -1292,7 +1292,7 @@ TtyInit( || iostate.c_lflag != 0 || iostate.c_cflag & CREAD || iostate.c_cc[VMIN] != 1 - || iostate.c_cc[VTIME] != 0) + || iostate.c_cc[VTIME] != 0) { iostate.c_iflag = IGNBRK; iostate.c_oflag = 0; @@ -1361,6 +1361,11 @@ TclpOpenFileChannel( native = Tcl_FSGetNativePath(pathPtr); if (native == NULL) { + if (interp != (Tcl_Interp *) NULL) { + Tcl_AppendResult(interp, "couldn't open \"", + TclGetString(pathPtr), "\": filename is invalid on this platform", + NULL); + } return NULL; } @@ -1819,7 +1824,7 @@ TclUnixWaitForFile( if (FD_ISSET(fd, &writableMask)) { SET_BITS(result, TCL_WRITABLE); } - if (FD_ISSET(fd, &exceptionMask)) { + if (FD_ISSET(fd, &exceptionMask)) { SET_BITS(result, TCL_EXCEPTION); } result &= mask; |