Tcl Source Code

Artifact [b3b5162e7b]
Login

Artifact b3b5162e7b420e09d3bade1975b5bea379ad4691808d20449add080bffcc6d97:

Attachment "tclEnv.c-diff" to ticket [b492c33154] added by chw 2026-05-13 20:24:35.
Index: generic/tclEnv.c
==================================================================
--- generic/tclEnv.c
+++ generic/tclEnv.c
@@ -664,25 +664,36 @@
      * If a value is being set, call TclSetEnv to do all of the work.
      */
 
     if (flags & TCL_TRACE_WRITES) {
 	const char *value;
-	Tcl_DString ds;
 
 	value = Tcl_GetVar2(interp, "env", name2, TCL_GLOBAL_ONLY);
-	Tcl_DStringInit(&ds);
-	if (Tcl_UtfToExternalDStringEx(NULL, TCLFSENCODING, name2, -1, 0, &ds, NULL) != TCL_OK) {
-	    Tcl_DStringFree(&ds);
-	    return (char *) "encoding error";
-	}
-	if (Tcl_UtfToExternalDStringEx(NULL, TCLFSENCODING, value, -1, 0, &ds, NULL) != TCL_OK) {
+#if defined(_WIN32)
+	if (value[0] == '\0') {
+	    TclUnsetEnv(name2);
+	    flags &= ~TCL_TRACE_UNSETS;
+	} else
+#endif
+	{
+	    Tcl_DString ds;
+
+	    Tcl_DStringInit(&ds);
+	    if (Tcl_UtfToExternalDStringEx(NULL, TCLFSENCODING, name2, -1, 0,
+		    &ds, NULL) != TCL_OK) {
+		Tcl_DStringFree(&ds);
+		return (char *) "encoding error";
+	    }
+	    if (Tcl_UtfToExternalDStringEx(NULL, TCLFSENCODING, value, -1, 0,
+		    &ds, NULL) != TCL_OK) {
+		Tcl_DStringFree(&ds);
+		return (char *) "encoding error";
+	    }
 	    Tcl_DStringFree(&ds);
-	    return (char *) "encoding error";
+	    TclSetEnv(name2, value);
+	    TclEnvEpoch++;
 	}
-	Tcl_DStringFree(&ds);
-	TclSetEnv(name2, value);
-	TclEnvEpoch++;
     }
 
     /*
      * If a value is being read, call TclGetEnv to do all of the work.
      */