diff options
| author | dgp <dgp@users.sourceforge.net> | 2022-10-14 12:45:36 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2022-10-14 12:45:36 (GMT) |
| commit | 09b7fc60ad32803af1c3492d21bb0c46321d2f5a (patch) | |
| tree | 18261ade13bc58596fdb49722cb09cb1016d9d9b | |
| parent | 2901b939cc9374217df33203950a2b096eaf144e (diff) | |
| parent | f685c98a417dcab25fd035553cd16b61fbdeb74d (diff) | |
| download | tcl-09b7fc60ad32803af1c3492d21bb0c46321d2f5a.zip tcl-09b7fc60ad32803af1c3492d21bb0c46321d2f5a.tar.gz tcl-09b7fc60ad32803af1c3492d21bb0c46321d2f5a.tar.bz2 | |
merge 8.7
| -rw-r--r-- | generic/tclFileName.c | 13 | ||||
| -rw-r--r-- | generic/tclInt.h | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index b553621..3cdd52f 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -37,6 +37,17 @@ 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() */ + +#ifdef TCL_NO_DEPRECATED +# define TCL_GLOBMODE_NO_COMPLAIN 1 +# define TCL_GLOBMODE_DIR 4 +# define TCL_GLOBMODE_TAILS 8 +#endif /* * When there is no support for getting the block size of a file in a stat() @@ -1688,7 +1699,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 7871ecd..0092322 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -2781,10 +2781,12 @@ typedef struct TclFile_ *TclFile; * 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 +#ifndef TCL_NO_DEPRECATED +# define TCL_GLOBMODE_NO_COMPLAIN 1 +# define TCL_GLOBMODE_JOIN 2 +# define TCL_GLOBMODE_DIR 4 +# define TCL_GLOBMODE_TAILS 8 +#endif typedef enum Tcl_PathPart { TCL_PATH_DIRNAME, @@ -3198,9 +3200,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, |