From 9d4d81102579f655e9220ef0f705bb2a058d6ce3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 9 Nov 2020 16:12:37 +0000
Subject: Possible solution for [ea39ab591e], making simply everything
case-insensitive. TODO: TIP, documentation, code cleanup
---
generic/tclLoad.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 5090493..36c7457 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -226,8 +226,6 @@ Tcl_LoadObjCmd(
Tcl_DStringAppend(&pkgName, packageName, -1);
TclDStringClear(&tmp);
Tcl_DStringAppend(&tmp, pkgPtr->packageName, -1);
- Tcl_UtfToLower(Tcl_DStringValue(&pkgName));
- Tcl_UtfToLower(Tcl_DStringValue(&tmp));
if (strcmp(Tcl_DStringValue(&tmp),
Tcl_DStringValue(&pkgName)) == 0) {
namesMatch = 1;
@@ -321,6 +319,12 @@ Tcl_LoadObjCmd(
splitPtr = Tcl_FSSplitPath(objv[1], &pElements);
Tcl_ListObjIndex(NULL, splitPtr, pElements -1, &pkgGuessPtr);
pkgGuess = TclGetString(pkgGuessPtr);
+#if defined(_WIN32) || defined(__CYGWIN__)
+ if ((pkgGuess[0] == 'w') && (pkgGuess[1] == 'i')
+ && (pkgGuess[2] == 'n')) {
+ pkgGuess += 3;
+ } else
+#endif /* __CYGWIN__ */
if ((pkgGuess[0] == 'l') && (pkgGuess[1] == 'i')
&& (pkgGuess[2] == 'b')) {
pkgGuess += 3;
@@ -351,16 +355,17 @@ Tcl_LoadObjCmd(
}
Tcl_DStringAppend(&pkgName, pkgGuess, p - pkgGuess);
Tcl_DecrRefCount(splitPtr);
- }
- /*
- * Fix the capitalization in the package name so that the first
- * character is in caps (or title case) but the others are all
- * lower-case.
- */
+ /*
+ * Fix the capitalization in the package name so that the first
+ * character is in caps (or title case) but the others are all
+ * lower-case.
+ */
- Tcl_DStringSetLength(&pkgName,
- Tcl_UtfToTitle(Tcl_DStringValue(&pkgName)));
+ Tcl_DStringSetLength(&pkgName,
+ Tcl_UtfToTitle(Tcl_DStringValue(&pkgName)));
+
+ }
/*
* Compute the names of the two initialization functions, based on the
@@ -656,8 +661,6 @@ Tcl_UnloadObjCmd(
Tcl_DStringAppend(&pkgName, packageName, -1);
TclDStringClear(&tmp);
Tcl_DStringAppend(&tmp, pkgPtr->packageName, -1);
- Tcl_UtfToLower(Tcl_DStringValue(&pkgName));
- Tcl_UtfToLower(Tcl_DStringValue(&tmp));
if (strcmp(Tcl_DStringValue(&tmp),
Tcl_DStringValue(&pkgName)) == 0) {
namesMatch = 1;
--
cgit v0.12