summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-02-17 22:31:57 (GMT)
committermdejong <mdejong>2003-02-17 22:31:57 (GMT)
commit67083d99f9986ffc35b561cd80ad68a6a21f19b7 (patch)
treee90d2b8affafeaa8021794d70cc7c57feb8e6bcf
parent440e748e304fe8b1d12fa0e0706a9ed7a1898893 (diff)
downloadtcl-67083d99f9986ffc35b561cd80ad68a6a21f19b7.zip
tcl-67083d99f9986ffc35b561cd80ad68a6a21f19b7.tar.gz
tcl-67083d99f9986ffc35b561cd80ad68a6a21f19b7.tar.bz2
* generic/tclIO.c (Tcl_GetsObj): Minor change
so that eol is only assigned at the top of the TCL_TRANSLATE_AUTO case block. The other cases assign eol so this does not change any functionality.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclIO.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fab37a..3334055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-17 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * generic/tclIO.c (Tcl_GetsObj): Minor change
+ so that eol is only assigned at the top of the
+ TCL_TRANSLATE_AUTO case block. The other cases
+ assign eol so this does not change any functionality.
+
2003-02-17 Kevin Kenny <kennykb@users.sourceforge.net>
* tests/notify.test: Removed Windows line terminators. [Bug 687913].
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 5e2338d..91b45c2 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.59 2003/01/26 05:59:37 mdejong Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.60 2003/02/17 22:32:05 mdejong Exp $
*/
#include "tclInt.h"
@@ -3579,7 +3579,6 @@ Tcl_GetsObj(chan, objPtr)
* don't store the EOL in the output string.
*/
- eol = dst;
switch (statePtr->inputTranslation) {
case TCL_TRANSLATE_LF: {
for (eol = dst; eol < dstEnd; eol++) {
@@ -3628,6 +3627,7 @@ Tcl_GetsObj(chan, objPtr)
break;
}
case TCL_TRANSLATE_AUTO: {
+ eol = dst;
skip = 1;
if (statePtr->flags & INPUT_SAW_CR) {
statePtr->flags &= ~INPUT_SAW_CR;