summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclTest.c2
-rw-r--r--generic/zipfs.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 284d80a..5468c56 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -4507,7 +4507,7 @@ TestfeventCmd(
return TCL_ERROR;
}
if (interp2 != NULL) {
- code = Tcl_GlobalEval(interp2, argv[2]);
+ code = Tcl_EvalEx(interp2, argv[2], -1, TCL_EVAL_GLOBAL);
Tcl_SetObjResult(interp, Tcl_GetObjResult(interp2));
return code;
} else {
diff --git a/generic/zipfs.c b/generic/zipfs.c
index e789e14..b626e1b 100644
--- a/generic/zipfs.c
+++ b/generic/zipfs.c
@@ -699,7 +699,7 @@ ZipFSLookup(char *filename)
z = hPtr ? (ZipEntry *) Tcl_GetHashValue(hPtr) : NULL;
Tcl_DStringFree(&ds);
#if HAS_DRIVES
- if ((z != NULL) && (drive != z->zipfile->mntdrv)) {
+ if ((z != NULL) && drive && (drive != z->zipfile->mntdrv)) {
z = NULL;
}
#endif
@@ -748,7 +748,7 @@ ZipFSLookupMount(char *filename)
while (hPtr != NULL) {
if ((zf = (ZipFile *) Tcl_GetHashValue(hPtr)) != NULL) {
#if HAS_DRIVES
- if (drive != zf->mntdrv) {
+ if (drive && (drive != zf->mntdrv)) {
hPtr = Tcl_NextHashEntry(&search);
continue;
}