summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2007-01-17 10:20:56 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2007-01-17 10:20:56 (GMT)
commit6787537203fbff52ab41b0277f6d0d4a74447ffc (patch)
tree3991e03930e0ed173f13599a185e021b0179ff7a
parent483682e419ae2591f701c6dc800ab6643ad26d3f (diff)
downloadtcl-6787537203fbff52ab41b0277f6d0d4a74447ffc.zip
tcl-6787537203fbff52ab41b0277f6d0d4a74447ffc.tar.gz
tcl-6787537203fbff52ab41b0277f6d0d4a74447ffc.tar.bz2
Missed a spot; thanks to Andreas Kupries for spotting this one.
-rw-r--r--generic/tclIO.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index b7174af..ae49484 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIO.c,v 1.114 2007/01/17 00:42:16 dkf Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.115 2007/01/17 10:20:56 dkf Exp $
*/
#include "tclInt.h"
@@ -1082,6 +1082,9 @@ Tcl_GetChannel(
if (hPtr == NULL) {
Tcl_AppendResult(interp, "can not find channel named \"", chanName,
"\"", NULL);
+#if 0
+ Tcl_SetErrorCode(interp, "CORE", "LOOKUP", "CHANNEL", chanName, NULL);
+#endif
return NULL;
}
@@ -4266,7 +4269,7 @@ FilterInputBytes(
rawStart = RemovePoint(bufPtr);
raw = rawStart;
rawEnd = InsertPoint(bufPtr);
- rawLen = rawEnd - rawStart;
+ rawLen = BytesLeft(bufPtr);
dst = *gsPtr->dstPtr;
offset = dst - objPtr->bytes;
@@ -6969,6 +6972,7 @@ Tcl_SetChannelOption(
if ((len > 2) && (optionName[1] == 'b') &&
(strncmp(optionName, "-blocking", len) == 0)) {
int newMode;
+
if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
return TCL_ERROR;
}
@@ -7003,6 +7007,7 @@ Tcl_SetChannelOption(
} else if ((len > 7) && (optionName[1] == 'b') &&
(strncmp(optionName, "-buffersize", len) == 0)) {
int newBufferSize;
+
if (Tcl_GetInt(interp, newValue, &newBufferSize) == TCL_ERROR) {
return TCL_ERROR;
}
@@ -7074,9 +7079,9 @@ Tcl_SetChannelOption(
}
/*
- * [SF Tcl Bug 930851] Reset EOF and BLOCKED flags. Changing the
- * character which signals eof can transform a current eof condition
- * into a 'go ahead'. Ditto for blocked.
+ * [Bug 930851] Reset EOF and BLOCKED flags. Changing the character
+ * which signals eof can transform a current eof condition into a 'go
+ * ahead'. Ditto for blocked.
*/
statePtr->flags &=