summaryrefslogtreecommitdiffstats
path: root/win/tclWinFile.c
diff options
context:
space:
mode:
authorstanton <stanton>1999-03-19 04:01:17 (GMT)
committerstanton <stanton>1999-03-19 04:01:17 (GMT)
commit9af6e5daf2f88d2381a5bce5a83e8b42312ed736 (patch)
tree6aa5da312c5d1ebf2e3daaef3a6a8997a7baaeb2 /win/tclWinFile.c
parent8a41da9d96b3be396bcd9fa5ea9366dc562923f2 (diff)
downloadtcl-9af6e5daf2f88d2381a5bce5a83e8b42312ed736.zip
tcl-9af6e5daf2f88d2381a5bce5a83e8b42312ed736.tar.gz
tcl-9af6e5daf2f88d2381a5bce5a83e8b42312ed736.tar.bz2
* win/tclWinChan.c (TclpOpenFileChannel, Tcl_MakeFileChannel):
Changed to only test for console or comm handles when the type is FILE_TYPE_CHAR to avoid useless tests on simple files. Also reordered tests so consoles are tested first as this is more common. * win/makefile.vc: Regularized usage of mkd and rmd and rm. * library/encoding/shiftjis.enc: * tools/encoding/shiftjis.txt: Missing/incorrect characters in shift-jis table. [Bug: 1008, 1526] * generic/tclInt.decls: * generic/tcl.decls: Eliminated use of "string" and "list" from argument lists to avoid conflicts with C++ STL. [Bug: 1181] * win/tclWinFile.c (TclpMatchFiles): Changed to ignore the FS_CASE_IS_PRESERVED bit and always return exactly what we get from the system.
Diffstat (limited to 'win/tclWinFile.c')
-rw-r--r--win/tclWinFile.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 2dfa39c..c47a864 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinFile.c,v 1.1.2.4 1999/03/12 23:29:21 surles Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.1.2.5 1999/03/19 04:01:27 stanton Exp $
*/
#include "tclWinInt.h"
@@ -289,14 +289,13 @@ TclpMatchFiles(interp, separators, dirPtr, pattern, tail)
* the file name to lower case for comparison purposes. Note that we
* are ignoring the case sensitivity flag because Windows doesn't honor
* case even if the volume is case sensitive. If the volume also
- * doesn't preserve case, then we return the lower case form of the
- * name, otherwise we return the system form.
+ * doesn't preserve case, then we previously returned the lower case
+ * form of the name. This didn't seem quite right since there are
+ * non-case-preserving volumes that actually return mixed case. So now
+ * we are returning exactly what we get from the system.
*/
- if ((volFlags & FS_CASE_SENSITIVE) == 0) {
- Tcl_UtfToLower(name);
- }
-
+ Tcl_UtfToLower(name);
nativeMatchResult = NULL;
if ((matchDotFiles == 0) && (name[0] == '.')) {
@@ -319,9 +318,6 @@ TclpMatchFiles(interp, separators, dirPtr, pattern, tail)
*/
name = Tcl_WinTCharToUtf(nativeMatchResult, -1, &ds);
- if ((volFlags & FS_CASE_IS_PRESERVED) == 0) {
- Tcl_UtfToLower(name);
- }
Tcl_DStringAppend(dirPtr, name, -1);
Tcl_DStringFree(&ds);