diff options
| author | andreas_kupries <andreas_kupries@noemail.net> | 2003-10-22 22:35:45 (GMT) |
|---|---|---|
| committer | andreas_kupries <andreas_kupries@noemail.net> | 2003-10-22 22:35:45 (GMT) |
| commit | 4eda61c04f6b1033a8a6e4fa26c4576549e2ab83 (patch) | |
| tree | ec410cf26fa91a938dada03026c5823da24c17e9 /generic/tclTest.c | |
| parent | 06be787c102a218f34445a67ebee8a0c506e4f0f (diff) | |
| download | tcl-4eda61c04f6b1033a8a6e4fa26c4576549e2ab83.zip tcl-4eda61c04f6b1033a8a6e4fa26c4576549e2ab83.tar.gz tcl-4eda61c04f6b1033a8a6e4fa26c4576549e2ab83.tar.bz2 | |
* generic/tclIOUtil.c (FsListMounts, FsAddMountsToGlobResult): New
functions. See below for context.
(Tcl_FSMatchInDirectory): Modified to call on the new functions
(above) to handle the mountpoints in the glob'bed directory
correctly. Part of the patch by Vincent Darly to solve the
[Bug 800106] for the 8.4.x series.
* generic/tcl.h (TCL_GLOB_TYPE_MOUNT): New definition. Part of the
patch by Vincent Darly to solve [Bug 800106] for the 8.4.x series.
FossilOrigin-Name: a16319b2a6704b8177bb4d150a2990c6a44d161d
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index d3abdfb..4ce051d 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTest.c,v 1.62.2.2 2003/10/08 14:21:20 dkf Exp $ + * RCS: @(#) $Id: tclTest.c,v 1.62.2.3 2003/10/22 22:35:46 andreas_kupries Exp $ */ #define TCL_TEST @@ -6091,16 +6091,21 @@ TestReportOpenFileChannel(interp, fileName, mode, permissions) static int TestReportMatchInDirectory(interp, resultPtr, dirPtr, pattern, types) Tcl_Interp *interp; /* Interpreter to receive results. */ - Tcl_Obj *resultPtr; /* Directory separators to pass to TclDoGlob. */ + Tcl_Obj *resultPtr; /* Object to lappend results. */ Tcl_Obj *dirPtr; /* Contains path to directory to search. */ CONST char *pattern; /* Pattern to match against. */ Tcl_GlobTypeData *types; /* Object containing list of acceptable types. * May be NULL. */ { - TestReport("matchindirectory",dirPtr, NULL); - return Tcl_FSMatchInDirectory(interp, resultPtr, - TestReportGetNativePath(dirPtr), pattern, - types); + if (types != NULL && types->type & TCL_GLOB_TYPE_MOUNT) { + TestReport("matchmounts",dirPtr, NULL); + return TCL_OK; + } else { + TestReport("matchindirectory",dirPtr, NULL); + return Tcl_FSMatchInDirectory(interp, resultPtr, + TestReportGetNativePath(dirPtr), pattern, + types); + } } static int TestReportChdir(dirName) |