diff options
| author | andreas_kupries <andreas_kupries@noemail.net> | 2008-04-10 20:53:44 (GMT) |
|---|---|---|
| committer | andreas_kupries <andreas_kupries@noemail.net> | 2008-04-10 20:53:44 (GMT) |
| commit | 76eeebb3bd545c5425a2ed183c7bdcad7719aadf (patch) | |
| tree | 847cade9325eb1a02f8576fa8f85c1fece6d6138 /generic/tclIOCmd.c | |
| parent | 480925ffc75f4cad5ea248702894f64de1853da2 (diff) | |
| download | tcl-76eeebb3bd545c5425a2ed183c7bdcad7719aadf.zip tcl-76eeebb3bd545c5425a2ed183c7bdcad7719aadf.tar.gz tcl-76eeebb3bd545c5425a2ed183c7bdcad7719aadf.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.
FossilOrigin-Name: 383454627cd404ef7e4767ae11a52624f1397265
Diffstat (limited to 'generic/tclIOCmd.c')
| -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 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: |