Attachment "2821897fff.patch" to
ticket [2821897fff]
added by
stu
2018-06-14 13:05:44.
--- tclFileName.c~ Fri Oct 13 09:34:58 2017
+++ tclFileName.c Thu Jun 14 08:37:20 2018
@@ -1279,7 +1279,7 @@
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
- if (dir != PATH_NONE) {
+ if (dir != PATH_NONE && dir != PATH_DIR) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-directory\" cannot be used with \"-path\"", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
@@ -1304,7 +1304,7 @@
Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", NULL);
return TCL_ERROR;
}
- if (dir != PATH_NONE) {
+ if (dir != PATH_NONE && dir != PATH_GENERAL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"\"-path\" cannot be used with \"-directory\"", -1));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
