From 20eb6ce6c1e5b34d96d6ee9d0dfd14c73016d29b Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Mon, 4 Jan 2021 09:47:03 -0500
Subject: [PATCH] Made a few modifications to the patch from Keno Fischer (pull
 request startup.  I'm not sure that it is even possible to have a Tcl
 variable set at this point in the startup procedure, though.

---
 VERSION               |  2 +-
 tcltk/Makefile        | 11 ++++++-----
 tcltk/ext2sim.sh.in   |  4 ++--
 tcltk/ext2spice.sh.in |  4 ++--
 tcltk/magic.sh.in     |  4 ++--
 tcltk/tclmagic.c      | 16 +++++++++++-----
 utils/path.c          |  6 +++++-
 7 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/VERSION b/VERSION
index da6e281e..51c80744 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.108
+8.3.109
diff --git a/tcltk/Makefile b/tcltk/Makefile
index c233daff..283f8293 100644
--- a/tcltk/Makefile
+++ b/tcltk/Makefile
@@ -65,10 +65,9 @@ magicdnull: magicdnull.c ${MAGICDIR}/defs.mak
 		${GR_LIBS}
 
 magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak ${MAGICDIR}/VERSION
-	sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g  \
-	    -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \
+	sed -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \
 	    -e /MAGIC_REVISION/s%MAGIC_REVISION%${MAGIC_REVISION}%g \
-	    -e /SHDLIB_EXT/s%SHDLIB_EXT%${SHDLIB_EXT}%g magic.tcl.in > magic.tcl
+	    magic.tcl.in > magic.tcl
 
 magic.sh: magic.sh.in ${MAGICDIR}/defs.mak
 	sed -e /TCL_DIR_REL_OR_ABS/s%TCL_DIR_REL_OR_ABS%${TCL_DIR_REL_OR_ABS}%g \
@@ -76,10 +75,12 @@ magic.sh: magic.sh.in ${MAGICDIR}/defs.mak
 	    -e /WISH_EXE/s%WISH_EXE%${WISH_EXE}%g magic.sh.in > magic.sh
 
 ext2spice.sh: ext2spice.sh.in ${MAGICDIR}/defs.mak
-	sed -e /TCL_DIR_REL_OR_ABS/s%TCL_DIR_REL_OR_ABS%${TCL_DIR_REL_OR_ABS}%g ext2spice.sh.in > ext2spice.sh
+	sed -e /TCL_DIR_REL_OR_ABS/s%TCL_DIR_REL_OR_ABS%${TCL_DIR_REL_OR_ABS}%g \
+	    ext2spice.sh.in > ext2spice.sh
 
 ext2sim.sh: ext2sim.sh.in ${MAGICDIR}/defs.mak
-	sed -e /TCL_DIR_REL_OR_ABS/s%TCL_DIR_REL_OR_ABS%${TCL_DIR_REL_OR_ABS}%g ext2sim.sh.in > ext2sim.sh
+	sed -e /TCL_DIR_REL_OR_ABS/s%TCL_DIR_REL_OR_ABS%${TCL_DIR_REL_OR_ABS}%g \
+	    ext2sim.sh.in > ext2sim.sh
 
 $(DESTDIR)${INSTALL_TCLDIR}/%: %
 	${RM} $(DESTDIR)${INSTALL_TCLDIR}/$*
diff --git a/tcltk/ext2sim.sh.in b/tcltk/ext2sim.sh.in
index 1ac1aad1..1ef20ad2 100755
--- a/tcltk/ext2sim.sh.in
+++ b/tcltk/ext2sim.sh.in
@@ -16,9 +16,9 @@ for i in $@; do
 done
 TCL_REL_OR_ABS=TCL_DIR_REL_OR_ABS
 if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then
-TCL_DIR=$TCL_REL_OR_ABS
+   TCL_DIR=$TCL_REL_OR_ABS
 else
-TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
+   TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
 fi
 #
 eval ${TCL_DIR}/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
diff --git a/tcltk/ext2spice.sh.in b/tcltk/ext2spice.sh.in
index 7682beea..3e78a0da 100755
--- a/tcltk/ext2spice.sh.in
+++ b/tcltk/ext2spice.sh.in
@@ -16,9 +16,9 @@ for i in $@; do
 done
 TCL_REL_OR_ABS=TCL_DIR_REL_OR_ABS
 if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then
-TCL_DIR=$TCL_REL_OR_ABS
+   TCL_DIR=$TCL_REL_OR_ABS
 else
-TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
+   TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
 fi
 #
 eval ${TCL_DIR}/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF
diff --git a/tcltk/magic.sh.in b/tcltk/magic.sh.in
index e3d8c7a0..24846346 100755
--- a/tcltk/magic.sh.in
+++ b/tcltk/magic.sh.in
@@ -13,9 +13,9 @@
 
 TCL_REL_OR_ABS=TCL_DIR_REL_OR_ABS
 if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then
-TCL_DIR=$TCL_REL_OR_ABS
+   TCL_DIR=$TCL_REL_OR_ABS
 else
-TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
+   TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
 fi
 TKCON=true
 DNULL=
diff --git a/tcltk/tclmagic.c b/tcltk/tclmagic.c
index 0acf56ea..4c286c6e 100644
--- a/tcltk/tclmagic.c
+++ b/tcltk/tclmagic.c
@@ -1221,12 +1221,18 @@ Tclmagic_Init(interp)
 
     Tcl_Eval(interp, "lappend auto_path " TCL_DIR );
 
-    /* Set $CAD_ROOT as a Tcl variable */
+    /* Get $CAD_ROOT from a Tcl variable, if it exists, and if not, then */
+    /* set CAD_ROOT from the environment variable of the same name, if	 */
+    /* it exists, and finally fall back on the CAD_DIR set at compile	 */
+    /* time.								 */
 
-    cadroot = getenv("CAD_ROOT");
-    if (cadroot == NULL) cadroot = Tcl_GetVar(interp, "CAD_ROOT_DEFAULT", TCL_GLOBAL_ONLY);
-
-    Tcl_SetVar(interp, "CAD_ROOT", cadroot, TCL_GLOBAL_ONLY);
+    cadroot = Tcl_GetVar(interp, "CAD_ROOT", TCL_GLOBAL_ONLY);
+    if (cadroot == NULL)
+    {
+	cadroot = getenv("CAD_ROOT");
+	if (cadroot == NULL) cadroot = CAD_DIR;
+	Tcl_SetVar(interp, "CAD_ROOT", cadroot, TCL_GLOBAL_ONLY);
+    }
 
     Tcl_PkgProvide(interp, "Tclmagic", MAGIC_VERSION);
     return TCL_OK;
diff --git a/utils/path.c b/utils/path.c
index 6731d022..d63659c4 100644
--- a/utils/path.c
+++ b/utils/path.c
@@ -226,7 +226,11 @@ PaExpand(psource, pdest, size)
 	if (string == NULL)
 	{
 	    /* Check for CAD_ROOT = CAD_DIR, the only internal variable */
-	    /* recognized (this is passed down from the Makefile)	*/
+	    /* recognized (this is passed down from the Makefile).	*/
+	    /* Note that in the MAGIC_WRAPPER version, CAD_ROOT was set	*/
+	    /* as a Tcl variable in tcltk/tclmagic.c, such that if	*/
+	    /* expandName == "CAD_ROOT", then string should not be NULL	*/
+	    /* here.							*/
 
 	    if (!strcmp(expandName, "CAD_ROOT"))
 		string = CAD_DIR;