diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-06-10 11:34:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-06-10 11:34:07 (GMT) |
| commit | 4bdb2c7b6e010e31c2632a97aa8677cf08696c58 (patch) | |
| tree | 0a5f76e7466611e84a1ce51c7c0c37f38ad751e3 | |
| parent | 40c5514475ac9f4bb687d2ed22434b8d546e217d (diff) | |
| parent | 791b296b8e4589e45a2db9ad1a77fd723ae490c3 (diff) | |
| download | tcl-4bdb2c7b6e010e31c2632a97aa8677cf08696c58.zip tcl-4bdb2c7b6e010e31c2632a97aa8677cf08696c58.tar.gz tcl-4bdb2c7b6e010e31c2632a97aa8677cf08696c58.tar.bz2 | |
Fix [b876737a0b]: tcl::tm::path doesn't handle tilde expand
| -rw-r--r-- | changes.md | 5 | ||||
| -rw-r--r-- | unix/Makefile.in | 12 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/configure.ac | 2 |
4 files changed, 16 insertions, 5 deletions
@@ -32,8 +32,9 @@ to the userbase. - [lseq crash on out-of-range index](https://core.tcl-lang.org/tcl/tktview/7d3101) - [lseq crash on nested indices](https://core.tcl-lang.org/tcl/tktview/452b10) - [Build broken (trunk branch) tclCompExpr.c tclOOCall.c](https://core.tcl-lang.org/tcl/tktview/1dcda0) - - [Memory allocation runaway on truncated iso2022 encoding](https://core.tcl-lang.org/tcl/tktview/7346adc50) - - [Missing include dir for extensions in non-default locations](https://core.tcl-lang.org/tcl/tktview/3335120320) + - [Memory allocation runaway on truncated iso2022 encoding](https://core.tcl-lang.org/tcl/tktview/7346ad) + - [Missing include dir for extensions in non-default locations](https://core.tcl-lang.org/tcl/tktview/333512) + - [tcl::tm::path doesn't handle tilde expand](https://core.tcl-lang.org/tcl/tktview/b87673) # Incompatibilities - [The ActiveCodePage element has been removed from the Windows executable manifest for tclsh](https://core.tcl-lang.org/tips/doc/trunk/tip/716.md) diff --git a/unix/Makefile.in b/unix/Makefile.in index 9569b3b..2c0ddaa 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1097,7 +1097,17 @@ install-libraries: libraries done @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ] ; then \ echo "Customizing tcl module path"; \ - echo "if {![interp issafe]} { ::tcl::tm::roots [list $(TCL_MODULE_PATH)] }" >> \ + echo "if {![interp issafe]} {" >> \ + "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ + echo " ::tcl::tm::roots [lmap p [split {$(TCL_MODULE_PATH)} :] {" >> \ + "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ + echo " if {[catch {file tildeexpand [set p]} p]} continue" >> \ + "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ + echo " set p" >> \ + "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ + echo " }]" >> \ + "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ + echo "}" >> \ "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \ fi diff --git a/unix/configure b/unix/configure index 924d3a3..3c23360 100755 --- a/unix/configure +++ b/unix/configure @@ -11303,7 +11303,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ TCL_PACKAGE_PATH="~/Library/Tcl:/Library/Tcl:~/Library/Frameworks:/Library/Frameworks" test -z "$TCL_MODULE_PATH" && \ - TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" + TCL_MODULE_PATH="~/Library/Tcl:/Library/Tcl" elif test "$prefix/lib" != "$libdir"; then test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}:${prefix}/lib" else diff --git a/unix/configure.ac b/unix/configure.ac index d8adb4a..cd36358 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -869,7 +869,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ TCL_PACKAGE_PATH="~/Library/Tcl:/Library/Tcl:~/Library/Frameworks:/Library/Frameworks" test -z "$TCL_MODULE_PATH" && \ - TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" + TCL_MODULE_PATH="~/Library/Tcl:/Library/Tcl" elif test "$prefix/lib" != "$libdir"; then test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}:${prefix}/lib" else |