diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2024-08-15 15:26:23 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2024-08-15 15:26:23 (GMT) |
| commit | bc5ad3cf65f93eea249301f61a37cefaafa8c410 (patch) | |
| tree | 306b68de59a47d332c87c5747d91540aad454196 /generic | |
| parent | cc07fc14a8e04fe082c8a1a30484e6f85d74dcbd (diff) | |
| parent | 9789bd1def70ad52ffce2b41fd9aee9cafa182d1 (diff) | |
| download | tcl-bc5ad3cf65f93eea249301f61a37cefaafa8c410.zip tcl-bc5ad3cf65f93eea249301f61a37cefaafa8c410.tar.gz tcl-bc5ad3cf65f93eea249301f61a37cefaafa8c410.tar.bz2 | |
Consolidated zipfs changes. Thanks Torsten!
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 13 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 16 |
2 files changed, 18 insertions, 11 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 7f8d68c..d120d5b 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -463,14 +463,23 @@ static const UnsafeEnsembleInfo unsafeEnsembleCommands[] = { {"process", "status"}, {"process", "purge"}, {"process", "autopurge"}, - /* [zipfs] has MANY unsafe commands! */ + /* + * [zipfs] perhaps has some safe commands. But like file make it inaccessible + * until they are analyzed to be safe. + */ + {"zipfs", NULL}, + {"zipfs", "canonical"}, + {"zipfs", "exists"}, + {"zipfs", "info"}, + {"zipfs", "list"}, {"zipfs", "lmkimg"}, {"zipfs", "lmkzip"}, {"zipfs", "mkimg"}, {"zipfs", "mkkey"}, {"zipfs", "mkzip"}, {"zipfs", "mount"}, - {"zipfs", "mount_data"}, + {"zipfs", "mountdata"}, + {"zipfs", "root"}, {"zipfs", "unmount"}, {NULL, NULL} }; diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 0c964e8..562d28b 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -2628,7 +2628,7 @@ ZipFSMountObjCmd( * * ZipFSMountBufferObjCmd -- * - * This procedure is invoked to process the [zipfs mount_data] command. + * This procedure is invoked to process the [zipfs mountdata] command. * * Results: * A standard Tcl result. @@ -6204,16 +6204,15 @@ TclZipfs_Init( {"mkzip", ZipFSMkZipObjCmd, NULL, NULL, NULL, 1}, {"lmkimg", ZipFSLMkImgObjCmd, NULL, NULL, NULL, 1}, {"lmkzip", ZipFSLMkZipObjCmd, NULL, NULL, NULL, 1}, - /* The 4 entries above are not available in safe interpreters */ {"mount", ZipFSMountObjCmd, NULL, NULL, NULL, 1}, - {"mount_data", ZipFSMountBufferObjCmd, NULL, NULL, NULL, 1}, + {"mountdata", ZipFSMountBufferObjCmd, NULL, NULL, NULL, 1}, {"unmount", ZipFSUnmountObjCmd, NULL, NULL, NULL, 1}, {"mkkey", ZipFSMkKeyObjCmd, NULL, NULL, NULL, 1}, - {"exists", ZipFSExistsObjCmd, NULL, NULL, NULL, 0}, - {"info", ZipFSInfoObjCmd, NULL, NULL, NULL, 0}, - {"list", ZipFSListObjCmd, NULL, NULL, NULL, 0}, - {"canonical", ZipFSCanonicalObjCmd, NULL, NULL, NULL, 0}, - {"root", ZipFSRootObjCmd, NULL, NULL, NULL, 0}, + {"exists", ZipFSExistsObjCmd, NULL, NULL, NULL, 1}, + {"info", ZipFSInfoObjCmd, NULL, NULL, NULL, 1}, + {"list", ZipFSListObjCmd, NULL, NULL, NULL, 1}, + {"canonical", ZipFSCanonicalObjCmd, NULL, NULL, NULL, 1}, + {"root", ZipFSRootObjCmd, NULL, NULL, NULL, 1}, {NULL, NULL, NULL, NULL, NULL, 0} }; static const char findproc[] = @@ -6269,7 +6268,6 @@ TclZipfs_Init( TclDictPutString(NULL, mapObj, "find", "::tcl::zipfs::find"); Tcl_CreateObjCommand(interp, "::tcl::zipfs::tcl_library_init", ZipFSTclLibraryObjCmd, NULL, NULL); - Tcl_PkgProvide(interp, "tcl::zipfs", "2.0"); } return TCL_OK; #else /* !HAVE_ZLIB */ |