diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-04-10 20:55:25 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-04-10 20:55:25 (GMT) |
| commit | bc0c76f942f4b2bbeb5fc0ed30a832b6fa0ea93d (patch) | |
| tree | 5759c7413cef93580234aa0308a0546156c5eb11 /generic | |
| parent | d3b620c65854c8ff37d4e90fa7c04c980a2af171 (diff) | |
| download | tcl-bc0c76f942f4b2bbeb5fc0ed30a832b6fa0ea93d.zip tcl-bc0c76f942f4b2bbeb5fc0ed30a832b6fa0ea93d.tar.gz tcl-bc0c76f942f4b2bbeb5fc0ed30a832b6fa0ea93d.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
* tests/chanio.test (chan-io-52.5{,a,b}): 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.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c index 3c34845..00ca527 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.51.2.1 2008/04/09 18:36:18 andreas_kupries Exp $ + * RCS: @(#) $Id: tclIOCmd.c,v 1.51.2.2 2008/04/10 20:55:26 andreas_kupries Exp $ */ #include "tclInt.h" @@ -1644,18 +1644,13 @@ Tcl_FcopyObjCmd( 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: |