diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-13 21:12:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-10-13 21:12:07 (GMT) |
| commit | a64794ef40906be0a52fe8abfe8205b183fb65bd (patch) | |
| tree | 417ce8b7d3b80989477385282d3a704d11e25b5d | |
| parent | 1ce12936bb5a61da601a88b65334e0441a9c598c (diff) | |
| parent | f685c98a417dcab25fd035553cd16b61fbdeb74d (diff) | |
| download | tcl-a64794ef40906be0a52fe8abfe8205b183fb65bd.zip tcl-a64794ef40906be0a52fe8abfe8205b183fb65bd.tar.gz tcl-a64794ef40906be0a52fe8abfe8205b183fb65bd.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclFileName.c | 15 | ||||
| -rw-r--r-- | generic/tclInt.h | 13 |
2 files changed, 12 insertions, 16 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 408d295..2628e41 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -35,6 +35,15 @@ static Tcl_Obj * SplitUnixPath(const char *path); static int DoGlob(Tcl_Interp *interp, Tcl_Obj *resultPtr, const char *separators, Tcl_Obj *pathPtr, int flags, char *pattern, Tcl_GlobTypeData *types); +static int TclGlob(Tcl_Interp *interp, char *pattern, + Tcl_Obj *pathPrefix, int globFlags, + Tcl_GlobTypeData *types); + +/* Flag values used by TclGlob() */ + +#define TCL_GLOBMODE_NO_COMPLAIN 1 +#define TCL_GLOBMODE_DIR 4 +#define TCL_GLOBMODE_TAILS 8 /* * When there is no support for getting the block size of a file in a stat() @@ -1132,8 +1141,8 @@ Tcl_GlobObjCmd( dir = PATH_NONE; typePtr = NULL; for (i = 1; i < objc; i++) { - if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObj(interp, objv[i], options, + "option", 0, &index) != TCL_OK) { string = TclGetString(objv[i]); if (string[0] == '-') { /* @@ -1595,7 +1604,7 @@ Tcl_GlobObjCmd( *---------------------------------------------------------------------- */ -int +static int TclGlob( Tcl_Interp *interp, /* Interpreter for returning error message or * appending list of matching file names. */ diff --git a/generic/tclInt.h b/generic/tclInt.h index a02650a..a876f37 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -2767,16 +2767,6 @@ typedef struct TclFileAttrProcs { typedef struct TclFile_ *TclFile; -/* - * The "globParameters" argument of the function TclGlob is an or'ed - * combination of the following values: - */ - -#define TCL_GLOBMODE_NO_COMPLAIN 1 -#define TCL_GLOBMODE_JOIN 2 -#define TCL_GLOBMODE_DIR 4 -#define TCL_GLOBMODE_TAILS 8 - typedef enum Tcl_PathPart { TCL_PATH_DIRNAME, TCL_PATH_TAIL, @@ -3188,9 +3178,6 @@ MODULE_SCOPE int TclGetLoadedLibraries(Tcl_Interp *interp, const char *packageName); MODULE_SCOPE int TclGetWideBitsFromObj(Tcl_Interp *, Tcl_Obj *, Tcl_WideInt *); -MODULE_SCOPE int TclGlob(Tcl_Interp *interp, char *pattern, - Tcl_Obj *unquotedPrefix, int globFlags, - Tcl_GlobTypeData *types); MODULE_SCOPE int TclIncrObj(Tcl_Interp *interp, Tcl_Obj *valuePtr, Tcl_Obj *incrPtr); MODULE_SCOPE Tcl_Obj * TclIncrObjVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, |