diff options
author | hypnotoad <yoda@etoyoc.com> | 2013-04-29 12:31:11 (GMT) |
---|---|---|
committer | hypnotoad <yoda@etoyoc.com> | 2013-04-29 12:31:11 (GMT) |
commit | 7e98e681444fc1b49413624707b811aa45a5b6fa (patch) | |
tree | 9624a61058e7f648dd4d3e730572daf142b344c9 /generic/tclFCmd.c | |
parent | f23f5f814767bd8ee631943d6a6840ed563e0dea (diff) | |
parent | 1d75b0eb9444d42e7399a40853deb8bb47a88e4d (diff) | |
download | tcl-hypnotoad_prefer_native_8_6.zip tcl-hypnotoad_prefer_native_8_6.tar.gz tcl-hypnotoad_prefer_native_8_6.tar.bz2 |
Bringing patch up to date with the latest trunkhypnotoad_prefer_native_8_6
Diffstat (limited to 'generic/tclFCmd.c')
-rw-r--r-- | generic/tclFCmd.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c index 33c1496..13377d3 100644 --- a/generic/tclFCmd.c +++ b/generic/tclFCmd.c @@ -734,17 +734,14 @@ CopyRenameOneFile( */ errfile = target; - - /* - * We now need to reset the result, because the above call, if it - * failed, may have put an error message in place. (Ideally we - * would prefer not to pass an interpreter in above, but the - * channel IO code used by TclCrossFilesystemCopy currently - * requires one). - */ - - Tcl_ResetResult(interp); } + /* + * We now need to reset the result, because the above call, + * may have left set it. (Ideally we would prefer not to pass + * an interpreter in above, but the channel IO code used by + * TclCrossFilesystemCopy currently requires one) + */ + Tcl_ResetResult(interp); } if ((copyFlag == 0) && (result == TCL_OK)) { if (S_ISDIR(sourceStatBuf.st_mode)) { |