summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-04-10 20:53:45 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-04-10 20:53:45 (GMT)
commit79f2b1d44214dd346a198ac6dde940f3ad0532ea (patch)
tree847cade9325eb1a02f8576fa8f85c1fece6d6138 /generic
parent7771a657c1cab8174616928296ec54f956aae809 (diff)
downloadtcl-79f2b1d44214dd346a198ac6dde940f3ad0532ea.zip
tcl-79f2b1d44214dd346a198ac6dde940f3ad0532ea.tar.gz
tcl-79f2b1d44214dd346a198ac6dde940f3ad0532ea.tar.bz2
* generic/tclIOCmd.c (Tcl_FcopyObjCmd): Keeping check for negative
values, changed to not be an error, but behave like the special value -1 (copy all, default). * tests/iocmd.test (iocmd-15.{12,13}): Removed. * tests/io.test (io-52.5{,a,b}): Reverted last change, added comment regarding the meaning of -1, added two more testcases for other negative values, and input wrapped to negative.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIOCmd.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 48debd8..2e49c8e 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOCmd.c,v 1.15.2.4 2008/04/09 18:35:27 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclIOCmd.c,v 1.15.2.5 2008/04/10 20:53:48 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -1543,18 +1543,13 @@ Tcl_FcopyObjCmd(dummy, interp, objc, objv)
return TCL_ERROR;
}
if (toRead<0) {
- Tcl_WideInt w;
- if (Tcl_GetWideIntFromObj(interp, objv[i+1], &w) != TCL_OK) {
- return TCL_ERROR;
- }
- if (w >= (Tcl_WideInt)0) {
- Tcl_AppendResult(interp,
- "integer value to large to represent as 32bit signed value",
- NULL);
- } else {
- Tcl_AppendResult(interp, "negative size forbidden", NULL);
- }
- return TCL_ERROR;
+ /*
+ * Handle all negative sizes like -1, meaning 'copy all'.
+ * By resetting toRead we avoid changes in the
+ * core copying functions (which explicitly check
+ * for -1 and crash on any other negative value).
+ */
+ toRead = -1;
}
break;
case FcopyCommand: