git: 2793ffac6bf1 - stable/14 - sqlite3: Vendor import of sqlite3 3.54.1

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Wed, 04 Nov 2026 13:29:46 UTC
The branch stable/14 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=2793ffac6bf1b7383d666a4e80fb395793d95e58

commit 2793ffac6bf1b7383d666a4e80fb395793d95e58
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2026-11-03 16:45:06 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2026-11-03 17:11:11 +0000

    sqlite3: Vendor import of sqlite3 3.54.1
    
    Release notes at https://sqlite.org/releaselog/3_54_1.html.
    
    Obtained from:  https://www.sqlite.org/2026/sqlite-autoconf-3540100.tar.gz
    Security:       84cd82e1-d49f-11f1-bae2-3497f65b111b
                    CVE-2026-119371
                    CVE-2026-119372
                    CVE-2026-119373
                    CVE-2026-119374
                    CVE-2026-119375
                    CVE-2026-119376
                    CVE-2026-119377
                    CVE-2026-119378
                    CVE-2026-119379
                    CVE-2026-119591
    
    Merge commit '8fcea37c441fdc95cbfc8c34eeb0dcddbc02dca1'
    
    (cherry picked from commit 71bb028fc165e51e6d04e509749da48f48f3aab4)
---
 contrib/sqlite3/VERSION                      |    2 +-
 contrib/sqlite3/autosetup/cc.tcl             |    2 +-
 contrib/sqlite3/autosetup/find_tclconfig.tcl |   18 +-
 contrib/sqlite3/autosetup/jimsh0.c           | 2912 +++++---
 contrib/sqlite3/autosetup/proj.tcl           |    4 +-
 contrib/sqlite3/autosetup/sqlite-config.tcl  |  249 +-
 contrib/sqlite3/shell.c                      | 4184 ++++++++---
 contrib/sqlite3/sqlite3.c                    | 9654 +++++++++++++++-----------
 contrib/sqlite3/sqlite3.h                    |  156 +-
 contrib/sqlite3/sqlite3ext.h                 |   22 +-
 contrib/sqlite3/sqlite3rc.h                  |    2 +-
 contrib/sqlite3/tea/generic/tclsqlite3.c     |   87 +-
 12 files changed, 11300 insertions(+), 5992 deletions(-)

diff --git a/contrib/sqlite3/VERSION b/contrib/sqlite3/VERSION
index a03878a48a9b..5bf0dc11f231 100644
--- a/contrib/sqlite3/VERSION
+++ b/contrib/sqlite3/VERSION
@@ -1 +1 @@
-3.53.3
+3.54.1
diff --git a/contrib/sqlite3/autosetup/cc.tcl b/contrib/sqlite3/autosetup/cc.tcl
index 05c1b1cf4068..7c9284b19456 100644
--- a/contrib/sqlite3/autosetup/cc.tcl
+++ b/contrib/sqlite3/autosetup/cc.tcl
@@ -583,7 +583,7 @@ proc cctest {args} {
 		configlog "============"
 	}
 	file delete $src
-	file delete $tmp
+	catch {file delete $tmp}
 
 	# cache it
 	set ::cc_cache($cmdline,$lines) $ok
diff --git a/contrib/sqlite3/autosetup/find_tclconfig.tcl b/contrib/sqlite3/autosetup/find_tclconfig.tcl
index c3d3df8ec3ab..3a7e0c971626 100644
--- a/contrib/sqlite3/autosetup/find_tclconfig.tcl
+++ b/contrib/sqlite3/autosetup/find_tclconfig.tcl
@@ -12,13 +12,15 @@ if {![file exists $libdir]} {
   puts stderr "tclsh reported library directory \"$libdir\" does not exist"
   exit 1
 }
-if {![file exists $libdir/tclConfig.sh]} {
-  set n1 $libdir/tcl$::tcl_version
-  if {[file exists $n1/tclConfig.sh]} {
-    set libdir $n1
-  } else {
-    puts stderr "cannot find tclConfig.sh in either $libdir or $n1"
-    exit 1
+set candidates [list $libdir $libdir/tcl$::tcl_version]
+foreach d $::tcl_pkgPath {
+  lappend candidates $d $d/tcl$::tcl_version
+}
+foreach d $candidates {
+  if {[file exists $d/tclConfig.sh]} {
+    puts $d
+    exit 0
   }
 }
-puts $libdir
+puts stderr "cannot find tclConfig.sh in any of: [join $candidates {, }]"
+exit 1
diff --git a/contrib/sqlite3/autosetup/jimsh0.c b/contrib/sqlite3/autosetup/jimsh0.c
index 0f0a890888b4..a8dbc761180e 100644
--- a/contrib/sqlite3/autosetup/jimsh0.c
+++ b/contrib/sqlite3/autosetup/jimsh0.c
@@ -50,7 +50,11 @@
 #else
 #define _GNU_SOURCE
 #endif
+#ifndef __ixemul__
 #define HAVE_FORK
+#else
+#define HAVE_VFORK
+#endif
 #define HAVE_WAITPID
 #define HAVE_ISATTY
 #define HAVE_MKSTEMP
@@ -158,7 +162,6 @@ int utf8_fromunicode(char *p, unsigned uc);
 
 
 #define utf8_strlen(S, B) ((B) < 0 ? (int)strlen(S) : (B))
-#define utf8_strwidth(S, B) utf8_strlen((S), (B))
 #define utf8_tounicode(S, CP) (*(CP) = (unsigned char)*(S), 1)
 #define utf8_getchars(CP, C) (*(CP) = (C), 1)
 #define utf8_upper(C) toupper(C)
@@ -167,7 +170,6 @@ int utf8_fromunicode(char *p, unsigned uc);
 #define utf8_index(C, I) (I)
 #define utf8_charlen(C) 1
 #define utf8_prev_len(S, L) 1
-#define utf8_width(C) 1
 
 #else
 
@@ -223,11 +225,13 @@ extern "C" {
 #  endif
 #endif
 
+
 #define UCHAR(c) ((unsigned char)(c))
 
 
 
-#define JIM_ABI_VERSION 101
+#define JIM_ABI_VERSION 102
+
 
 #define JIM_OK 0
 #define JIM_ERR 1
@@ -237,6 +241,8 @@ extern "C" {
 #define JIM_SIGNAL 5
 #define JIM_EXIT 6
 
+#define JIM_USAGE -1
+
 #define JIM_EVAL 7
 
 #define JIM_MAX_CALLFRAME_DEPTH 1000
@@ -247,7 +253,6 @@ extern "C" {
 
 #define JIM_NONE 0
 #define JIM_ERRMSG 1
-#define JIM_ENUM_ABBREV 2
 #define JIM_UNSHARED 4
 #define JIM_MUSTEXIST 8
 #define JIM_NORESULT 16
@@ -258,6 +263,14 @@ extern "C" {
 #define JIM_SUBST_NOESC 4
 #define JIM_SUBST_FLAG 128
 
+#define JIM_TAINT_STD   1 /* The "normal" type of taint. Allows for multiple
+                           * types of taint in the future
+                           */
+#define JIM_TAINT_ANY   ~0
+
+
+#define JIM_ENUM_ABBREV 2
+
 
 #define JIM_CASESENS    0
 #define JIM_NOCASE      1
@@ -267,6 +280,7 @@ extern "C" {
 #define JIM_PATH_LEN 1024
 
 
+
 #define JIM_NOTUSED(V) ((void) V)
 
 #define JIM_LIBPATH "auto_path"
@@ -277,6 +291,7 @@ typedef struct Jim_Stack {
     int len;
     int maxlen;
     void **vector;
+    void (*freefunc) (void *ptr);
 } Jim_Stack;
 
 
@@ -319,10 +334,12 @@ typedef struct Jim_HashTableIterator {
 #define JIM_HT_INITIAL_SIZE     16
 
 
+
 #define Jim_FreeEntryVal(ht, entry) \
     if ((ht)->type->valDestructor) \
         (ht)->type->valDestructor((ht)->privdata, (entry)->u.val)
 
+
 #define Jim_SetHashVal(ht, entry, _val_) do { \
     if ((ht)->type->valDup) \
         (entry)->u.val = (ht)->type->valDup((ht)->privdata, (_val_)); \
@@ -330,12 +347,15 @@ typedef struct Jim_HashTableIterator {
         (entry)->u.val = (_val_); \
 } while(0)
 
+
 #define Jim_SetHashIntVal(ht, entry, _val_) (entry)->u.intval = (_val_)
 
+
 #define Jim_FreeEntryKey(ht, entry) \
     if ((ht)->type->keyDestructor) \
         (ht)->type->keyDestructor((ht)->privdata, (entry)->key)
 
+
 #define Jim_SetHashKey(ht, entry, _key_) do { \
     if ((ht)->type->keyDup) \
         (entry)->key = (ht)->type->keyDup((ht)->privdata, (_key_)); \
@@ -343,18 +363,26 @@ typedef struct Jim_HashTableIterator {
         (entry)->key = (void *)(_key_); \
 } while(0)
 
+
 #define Jim_CompareHashKeys(ht, key1, key2) \
     (((ht)->type->keyCompare) ? \
         (ht)->type->keyCompare((ht)->privdata, (key1), (key2)) : \
         (key1) == (key2))
 
+
 #define Jim_HashKey(ht, key) ((ht)->type->hashFunction(key) + (ht)->uniq)
 
+
 #define Jim_GetHashEntryKey(he) ((he)->key)
+
 #define Jim_GetHashEntryVal(he) ((he)->u.val)
+
 #define Jim_GetHashEntryIntVal(he) ((he)->u.intval)
+
 #define Jim_GetHashTableCollisions(ht) ((ht)->collisions)
+
 #define Jim_GetHashTableSize(ht) ((ht)->size)
+
 #define Jim_GetHashTableUsed(ht) ((ht)->used)
 
 
@@ -363,6 +391,7 @@ typedef struct Jim_Obj {
     const struct Jim_ObjType *typePtr;
     int refCount;
     int length;
+    unsigned taint;
 
     union {
 
@@ -434,24 +463,30 @@ typedef struct Jim_Obj {
 } Jim_Obj;
 
 
+
 #define Jim_IncrRefCount(objPtr) \
     ++(objPtr)->refCount
+
 #define Jim_DecrRefCount(interp, objPtr) \
     if (--(objPtr)->refCount <= 0) Jim_FreeObj(interp, objPtr)
+
 #define Jim_IsShared(objPtr) \
     ((objPtr)->refCount > 1)
 
 #define Jim_FreeNewObj Jim_FreeObj
 
 
+
 #define Jim_FreeIntRep(i,o) \
     if ((o)->typePtr && (o)->typePtr->freeIntRepProc) \
         (o)->typePtr->freeIntRepProc(i, o)
 
 
+
 #define Jim_GetIntRepPtr(o) (o)->internalRep.ptr
 
 
+
 #define Jim_SetIntRepPtr(o, p) \
     (o)->internalRep.ptr = (p)
 
@@ -490,8 +525,6 @@ typedef struct Jim_CallFrame {
     Jim_Obj *procBodyObjPtr;
     struct Jim_CallFrame *next;
     Jim_Obj *nsObj;
-    Jim_Obj *unused_fileNameObj;
-    int unused_line;
     Jim_Stack *localCommands;
     struct Jim_Obj *tailcallObj;
     struct Jim_Cmd *tailcallCmd;
@@ -534,9 +567,15 @@ typedef struct Jim_Dict {
     unsigned int dummy;
 } Jim_Dict;
 
+#define JIM_CMD_ISPROC 1
+#define JIM_CMD_ISCHANNEL 2
+#define JIM_CMD_ISALIAS 4
+
+#define JIM_CMD_NOTAINT 0x100
+
 typedef struct Jim_Cmd {
     int inUse;
-    int isproc;
+    int flags;
     struct Jim_Cmd *prevCmd;
     Jim_Obj *cmdNameObj;
     union {
@@ -545,6 +584,10 @@ typedef struct Jim_Cmd {
             Jim_CmdProc *cmdProc;
             Jim_DelCmdProc *delProc;
             void *privData;
+            const char *usage;
+            const char *help;
+            short minargs;
+            short maxargs;
         } native;
         struct {
 
@@ -573,7 +616,6 @@ typedef struct Jim_PrngState {
 
 typedef struct Jim_Interp {
     Jim_Obj *result;
-    int unused_errorLine;
     Jim_Obj *currentFilenameObj;
     int break_level;
     int maxCallFrameDepth;
@@ -601,11 +643,9 @@ typedef struct Jim_Interp {
     int safeexpr;
     Jim_Obj *liveList;
     Jim_Obj *freeList;
-    Jim_Obj *unused_currentScriptObj;
     Jim_EvalFrame topEvalFrame;
     Jim_EvalFrame *evalFrame;
     int procLevel;
-    Jim_Obj * const *unused_argv;
     Jim_Obj *nullScriptObj;
     Jim_Obj *emptyObj;
     Jim_Obj *trueObj;
@@ -624,7 +664,7 @@ typedef struct Jim_Interp {
     Jim_Obj *defer;
     Jim_Obj *traceCmdObj;
     int unknown_called;
-    int errorFlag;
+    int hasErrorStackTrace;
     void *cmdPrivData; /* Used to pass the private data pointer to
                   a command. It is set to what the user specified
                   via Jim_CreateCommand(). */
@@ -636,16 +676,24 @@ typedef struct Jim_Interp {
     Jim_PrngState *prngState;
     struct Jim_HashTable packages;
     Jim_Stack *loadHandles;
+    unsigned taint;
 } Jim_Interp;
 
+
 #define Jim_SetResultString(i,s,l) Jim_SetResult(i, Jim_NewStringObj(i,s,l))
+
 #define Jim_SetResultInt(i,intval) Jim_SetResult(i, Jim_NewIntObj(i,intval))
 
+
 #define Jim_SetResultBool(i,b) Jim_SetResultInt(i, b)
+
 #define Jim_SetEmptyResult(i) Jim_SetResult(i, (i)->emptyObj)
+
 #define Jim_GetResult(i) ((i)->result)
+
 #define Jim_CmdPrivData(i) ((i)->cmdPrivData)
 
+
 #define Jim_SetResult(i,o) do {     \
     Jim_Obj *_resultObjPtr_ = (o);    \
     Jim_IncrRefCount(_resultObjPtr_); \
@@ -654,6 +702,7 @@ typedef struct Jim_Interp {
 } while(0)
 
 
+
 #define Jim_GetId(i) (++(i)->id)
 
 
@@ -666,7 +715,9 @@ typedef struct Jim_Reference {
 } Jim_Reference;
 
 
+
 #define Jim_NewEmptyStringObj(i) Jim_NewStringObj(i, "", 0)
+
 #define Jim_FreeHashTableIterator(iter) Jim_Free(iter)
 
 #define JIM_EXPORT extern
@@ -675,15 +726,23 @@ typedef struct Jim_Reference {
 
 JIM_EXPORT void *(*Jim_Allocator)(void *ptr, size_t size);
 
+
 #define Jim_Free(P) Jim_Allocator((P), 0)
+
 #define Jim_Realloc(P, S) Jim_Allocator((P), (S))
+
 #define Jim_Alloc(S) Jim_Allocator(NULL, (S))
+
 JIM_EXPORT char * Jim_StrDup (const char *s);
+
 JIM_EXPORT char *Jim_StrDupLen(const char *s, int l);
 
 
+
 JIM_EXPORT char **Jim_GetEnviron(void);
+
 JIM_EXPORT void Jim_SetEnviron(char **env);
+
 JIM_EXPORT int Jim_MakeTempFile(Jim_Interp *interp, const char *filename_template, int unlink_file);
 #ifndef CLOCK_REALTIME
 #  define CLOCK_REALTIME 0
@@ -694,252 +753,380 @@ JIM_EXPORT int Jim_MakeTempFile(Jim_Interp *interp, const char *filename_templat
 #ifndef CLOCK_MONOTONIC_RAW
 #  define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
 #endif
+
 JIM_EXPORT jim_wide Jim_GetTimeUsec(unsigned type);
 
 
+
 JIM_EXPORT int Jim_Eval(Jim_Interp *interp, const char *script);
 
 
+
 JIM_EXPORT int Jim_EvalSource(Jim_Interp *interp, const char *filename, int lineno, const char *script);
 
+
 #define Jim_Eval_Named(I, S, F, L) Jim_EvalSource((I), (F), (L), (S))
 
+
 JIM_EXPORT int Jim_EvalGlobal(Jim_Interp *interp, const char *script);
+
 JIM_EXPORT int Jim_EvalFile(Jim_Interp *interp, const char *filename);
+
 JIM_EXPORT int Jim_EvalFileGlobal(Jim_Interp *interp, const char *filename);
+
 JIM_EXPORT int Jim_EvalObj (Jim_Interp *interp, Jim_Obj *scriptObjPtr);
+
 JIM_EXPORT int Jim_EvalObjVector (Jim_Interp *interp, int objc,
         Jim_Obj *const *objv);
+
 JIM_EXPORT int Jim_EvalObjList(Jim_Interp *interp, Jim_Obj *listObj);
+
 JIM_EXPORT int Jim_EvalObjPrefix(Jim_Interp *interp, Jim_Obj *prefix,
         int objc, Jim_Obj *const *objv);
+
 #define Jim_EvalPrefix(i, p, oc, ov) Jim_EvalObjPrefix((i), Jim_NewStringObj((i), (p), -1), (oc), (ov))
+
 JIM_EXPORT int Jim_EvalNamespace(Jim_Interp *interp, Jim_Obj *scriptObj, Jim_Obj *nsObj);
 JIM_EXPORT int Jim_SubstObj (Jim_Interp *interp, Jim_Obj *substObjPtr,
         Jim_Obj **resObjPtrPtr, int flags);
 
 
+
 JIM_EXPORT Jim_Obj *Jim_GetSourceInfo(Jim_Interp *interp, Jim_Obj *objPtr,
         int *lineptr);
 
+
 JIM_EXPORT void Jim_SetSourceInfo(Jim_Interp *interp, Jim_Obj *objPtr,
         Jim_Obj *fileNameObj, int lineNumber);
 
 
 
-JIM_EXPORT void Jim_InitStack(Jim_Stack *stack);
-JIM_EXPORT void Jim_FreeStack(Jim_Stack *stack);
-JIM_EXPORT int Jim_StackLen(Jim_Stack *stack);
+
+JIM_EXPORT void Jim_StackInit(Jim_Stack *stack, void (*freefunc) (void *ptr));
+
+JIM_EXPORT void Jim_StackFree(Jim_Stack *stack);
+
 JIM_EXPORT void Jim_StackPush(Jim_Stack *stack, void *element);
-JIM_EXPORT void * Jim_StackPop(Jim_Stack *stack);
-JIM_EXPORT void * Jim_StackPeek(Jim_Stack *stack);
-JIM_EXPORT void Jim_FreeStackElements(Jim_Stack *stack, void (*freeFunc)(void *ptr));
+
+JIM_EXPORT void *Jim_StackPop(Jim_Stack *stack);
+
 
 
 JIM_EXPORT int Jim_InitHashTable (Jim_HashTable *ht,
         const Jim_HashTableType *type, void *privdata);
+
 JIM_EXPORT void Jim_ExpandHashTable (Jim_HashTable *ht,
         unsigned int size);
+
 JIM_EXPORT int Jim_AddHashEntry (Jim_HashTable *ht, const void *key,
         void *val);
+
 JIM_EXPORT int Jim_ReplaceHashEntry (Jim_HashTable *ht,
         const void *key, void *val);
+
 JIM_EXPORT int Jim_DeleteHashEntry (Jim_HashTable *ht,
         const void *key);
+
 JIM_EXPORT int Jim_FreeHashTable (Jim_HashTable *ht);
+
 JIM_EXPORT Jim_HashEntry * Jim_FindHashEntry (Jim_HashTable *ht,
         const void *key);
+
 JIM_EXPORT Jim_HashTableIterator *Jim_GetHashTableIterator
         (Jim_HashTable *ht);
+
 JIM_EXPORT Jim_HashEntry * Jim_NextHashEntry
         (Jim_HashTableIterator *iter);
 
 
+
 JIM_EXPORT Jim_Obj * Jim_NewObj (Jim_Interp *interp);
+
 JIM_EXPORT void Jim_FreeObj (Jim_Interp *interp, Jim_Obj *objPtr);
+
 JIM_EXPORT void Jim_InvalidateStringRep (Jim_Obj *objPtr);
+
 JIM_EXPORT Jim_Obj * Jim_DuplicateObj (Jim_Interp *interp,
         Jim_Obj *objPtr);
+
 JIM_EXPORT const char * Jim_GetString(Jim_Obj *objPtr,
         int *lenPtr);
+
 JIM_EXPORT const char *Jim_String(Jim_Obj *objPtr);
+
 JIM_EXPORT int Jim_Length(Jim_Obj *objPtr);
 
 
+
 JIM_EXPORT Jim_Obj * Jim_NewStringObj (Jim_Interp *interp,
         const char *s, int len);
+
 JIM_EXPORT Jim_Obj *Jim_NewStringObjUtf8(Jim_Interp *interp,
         const char *s, int charlen);
+
 JIM_EXPORT Jim_Obj * Jim_NewStringObjNoAlloc (Jim_Interp *interp,
         char *s, int len);
+
 JIM_EXPORT void Jim_AppendString (Jim_Interp *interp, Jim_Obj *objPtr,
         const char *str, int len);
+
 JIM_EXPORT void Jim_AppendObj (Jim_Interp *interp, Jim_Obj *objPtr,
         Jim_Obj *appendObjPtr);
+
 JIM_EXPORT void Jim_AppendStrings (Jim_Interp *interp,
         Jim_Obj *objPtr, ...);
+
 JIM_EXPORT int Jim_StringEqObj(Jim_Obj *aObjPtr, Jim_Obj *bObjPtr);
+
 JIM_EXPORT int Jim_StringMatchObj (Jim_Interp *interp, Jim_Obj *patternObjPtr,
         Jim_Obj *objPtr, int nocase);
+
 JIM_EXPORT Jim_Obj * Jim_StringRangeObj (Jim_Interp *interp,
         Jim_Obj *strObjPtr, Jim_Obj *firstObjPtr,
         Jim_Obj *lastObjPtr);
+
 JIM_EXPORT Jim_Obj * Jim_FormatString (Jim_Interp *interp,
         Jim_Obj *fmtObjPtr, int objc, Jim_Obj *const *objv);
+
 JIM_EXPORT Jim_Obj * Jim_ScanString (Jim_Interp *interp, Jim_Obj *strObjPtr,
         Jim_Obj *fmtObjPtr, int flags);
+
 JIM_EXPORT int Jim_CompareStringImmediate (Jim_Interp *interp,
         Jim_Obj *objPtr, const char *str);
+
 JIM_EXPORT int Jim_StringCompareObj(Jim_Interp *interp, Jim_Obj *firstObjPtr,
         Jim_Obj *secondObjPtr, int nocase);
+
 JIM_EXPORT int Jim_Utf8Length(Jim_Interp *interp, Jim_Obj *objPtr);
 
 
+
 JIM_EXPORT Jim_Obj * Jim_NewReference (Jim_Interp *interp,
         Jim_Obj *objPtr, Jim_Obj *tagPtr, Jim_Obj *cmdNamePtr);
+
 JIM_EXPORT Jim_Reference * Jim_GetReference (Jim_Interp *interp,
         Jim_Obj *objPtr);
+
 JIM_EXPORT int Jim_SetFinalizer (Jim_Interp *interp, Jim_Obj *objPtr, Jim_Obj *cmdNamePtr);
+
 JIM_EXPORT int Jim_GetFinalizer (Jim_Interp *interp, Jim_Obj *objPtr, Jim_Obj **cmdNamePtrPtr);
 
 
+
 JIM_EXPORT Jim_Interp * Jim_CreateInterp (void);
+
 JIM_EXPORT void Jim_FreeInterp (Jim_Interp *i);
+
 JIM_EXPORT int Jim_GetExitCode (Jim_Interp *interp);
+
 JIM_EXPORT const char *Jim_ReturnCode(int code);
+
 JIM_EXPORT void Jim_SetResultFormatted(Jim_Interp *interp, const char *format, ...);
 
 
+JIM_EXPORT Jim_Cmd *Jim_RegisterCommand(Jim_Interp *interp, Jim_Obj *cmdNameObj,
+    Jim_CmdProc *cmdProc,
+    Jim_DelCmdProc *delProc,
+    const char *usage,
+    const char *help,
+    short minargs,
+    short maxargs,
+    int flags,
+    void *privData);
+
+JIM_EXPORT int Jim_CreateCommand (Jim_Interp *interp,
+        const char *cmdName, Jim_CmdProc *cmdProc, void *privData,
+         Jim_DelCmdProc *delProc);
+#define Jim_RegisterSimpleCmd(interp, name, usage, minargs, maxargs, cmdproc) \
+        Jim_RegisterCommand(interp, Jim_NewStringObj(interp, name, -1), cmdproc, NULL, usage, NULL, minargs, maxargs, 0, NULL)
+
+#define Jim_RegisterCmd(interp, name, usage, minargs, maxargs, cmdproc, delproc, privdata, flags) \
+        Jim_RegisterCommand(interp, Jim_NewStringObj(interp, name, -1), cmdproc, delproc, usage, NULL, minargs, maxargs, flags, privdata)
+
+
 JIM_EXPORT void Jim_RegisterCoreCommands (Jim_Interp *interp);
+
 JIM_EXPORT int Jim_CreateCommand (Jim_Interp *interp,
         const char *cmdName, Jim_CmdProc *cmdProc, void *privData,
          Jim_DelCmdProc *delProc);
+
 JIM_EXPORT int Jim_DeleteCommand (Jim_Interp *interp,
         Jim_Obj *cmdNameObj);
+
 JIM_EXPORT int Jim_RenameCommand (Jim_Interp *interp,
         Jim_Obj *oldNameObj, Jim_Obj *newNameObj);
+
 JIM_EXPORT Jim_Cmd * Jim_GetCommand (Jim_Interp *interp,
         Jim_Obj *objPtr, int flags);
+
+
 JIM_EXPORT int Jim_SetVariable (Jim_Interp *interp,
         Jim_Obj *nameObjPtr, Jim_Obj *valObjPtr);
+
 JIM_EXPORT int Jim_SetVariableStr (Jim_Interp *interp,
         const char *name, Jim_Obj *objPtr);
+
 JIM_EXPORT int Jim_SetGlobalVariableStr (Jim_Interp *interp,
         const char *name, Jim_Obj *objPtr);
+
 JIM_EXPORT int Jim_SetVariableStrWithStr (Jim_Interp *interp,
         const char *name, const char *val);
+
 JIM_EXPORT int Jim_SetVariableLink (Jim_Interp *interp,
         Jim_Obj *nameObjPtr, Jim_Obj *targetNameObjPtr,
         Jim_CallFrame *targetCallFrame);
+
 JIM_EXPORT Jim_Obj * Jim_MakeGlobalNamespaceName(Jim_Interp *interp,
         Jim_Obj *nameObjPtr);
 JIM_EXPORT Jim_Obj * Jim_GetVariable (Jim_Interp *interp,
         Jim_Obj *nameObjPtr, int flags);
+
 JIM_EXPORT Jim_Obj * Jim_GetGlobalVariable (Jim_Interp *interp,
         Jim_Obj *nameObjPtr, int flags);
+
 JIM_EXPORT Jim_Obj * Jim_GetVariableStr (Jim_Interp *interp,
         const char *name, int flags);
+
 JIM_EXPORT Jim_Obj * Jim_GetGlobalVariableStr (Jim_Interp *interp,
         const char *name, int flags);
+
 JIM_EXPORT int Jim_UnsetVariable (Jim_Interp *interp,
         Jim_Obj *nameObjPtr, int flags);
 
 
+
 JIM_EXPORT Jim_CallFrame *Jim_GetCallFrameByLevel(Jim_Interp *interp,
         Jim_Obj *levelObjPtr);
 
 
+
 JIM_EXPORT int Jim_Collect (Jim_Interp *interp);
+
 JIM_EXPORT void Jim_CollectIfNeeded (Jim_Interp *interp);
 
 
+
 JIM_EXPORT int Jim_GetIndex (Jim_Interp *interp, Jim_Obj *objPtr,
         int *indexPtr);
 
 
+
 JIM_EXPORT Jim_Obj * Jim_NewListObj (Jim_Interp *interp,
         Jim_Obj *const *elements, int len);
+
 JIM_EXPORT void Jim_ListInsertElements (Jim_Interp *interp,
         Jim_Obj *listPtr, int listindex, int objc, Jim_Obj *const *objVec);
+
 JIM_EXPORT void Jim_ListAppendElement (Jim_Interp *interp,
         Jim_Obj *listPtr, Jim_Obj *objPtr);
+
 JIM_EXPORT void Jim_ListAppendList (Jim_Interp *interp,
         Jim_Obj *listPtr, Jim_Obj *appendListPtr);
+
 JIM_EXPORT int Jim_ListLength (Jim_Interp *interp, Jim_Obj *objPtr);
+
 JIM_EXPORT int Jim_ListIndex (Jim_Interp *interp, Jim_Obj *listPrt,
         int listindex, Jim_Obj **objPtrPtr, int seterr);
+
 JIM_EXPORT Jim_Obj *Jim_ListGetIndex(Jim_Interp *interp, Jim_Obj *listPtr, int idx);
+
 JIM_EXPORT int Jim_SetListIndex (Jim_Interp *interp,
         Jim_Obj *varNamePtr, Jim_Obj *const *indexv, int indexc,
         Jim_Obj *newObjPtr);
+
 JIM_EXPORT Jim_Obj * Jim_ConcatObj (Jim_Interp *interp, int objc,
         Jim_Obj *const *objv);
+
 JIM_EXPORT Jim_Obj *Jim_ListJoin(Jim_Interp *interp,
         Jim_Obj *listObjPtr, const char *joinStr, int joinStrLen);
 
 
+
 JIM_EXPORT Jim_Obj * Jim_NewDictObj (Jim_Interp *interp,
         Jim_Obj *const *elements, int len);
+
 JIM_EXPORT int Jim_DictKey (Jim_Interp *interp, Jim_Obj *dictPtr,
         Jim_Obj *keyPtr, Jim_Obj **objPtrPtr, int flags);
+
 JIM_EXPORT int Jim_DictKeysVector (Jim_Interp *interp,
         Jim_Obj *dictPtr, Jim_Obj *const *keyv, int keyc,
         Jim_Obj **objPtrPtr, int flags);
 JIM_EXPORT int Jim_SetDictKeysVector (Jim_Interp *interp,
         Jim_Obj *varNamePtr, Jim_Obj *const *keyv, int keyc,
         Jim_Obj *newObjPtr, int flags);
+
 JIM_EXPORT Jim_Obj **Jim_DictPairs(Jim_Interp *interp,
         Jim_Obj *dictPtr, int *len);
+
 JIM_EXPORT int Jim_DictAddElement(Jim_Interp *interp, Jim_Obj *objPtr,
         Jim_Obj *keyObjPtr, Jim_Obj *valueObjPtr);
 
 #define JIM_DICTMATCH_KEYS 0x0001
 #define JIM_DICTMATCH_VALUES 0x002
 
+
 JIM_EXPORT int Jim_DictMatchTypes(Jim_Interp *interp, Jim_Obj *objPtr, Jim_Obj *patternObj, int match_type, int return_types);
+
 JIM_EXPORT int Jim_DictSize(Jim_Interp *interp, Jim_Obj *objPtr);
+
 JIM_EXPORT int Jim_DictInfo(Jim_Interp *interp, Jim_Obj *objPtr);
+
 JIM_EXPORT Jim_Obj *Jim_DictMerge(Jim_Interp *interp, int objc, Jim_Obj *const *objv);
 
 
+
 JIM_EXPORT int Jim_GetReturnCode (Jim_Interp *interp, Jim_Obj *objPtr,
         int *intPtr);
 
 
+
 JIM_EXPORT int Jim_EvalExpression (Jim_Interp *interp,
         Jim_Obj *exprObjPtr);
+
 JIM_EXPORT int Jim_GetBoolFromExpr (Jim_Interp *interp,
         Jim_Obj *exprObjPtr, int *boolPtr);
 
 
+
 JIM_EXPORT int Jim_GetBoolean(Jim_Interp *interp, Jim_Obj *objPtr,
         int *booleanPtr);
 
 
+
 JIM_EXPORT int Jim_GetWide (Jim_Interp *interp, Jim_Obj *objPtr,
         jim_wide *widePtr);
+
 JIM_EXPORT int Jim_GetWideExpr(Jim_Interp *interp, Jim_Obj *objPtr,
         jim_wide *widePtr);
+
 JIM_EXPORT int Jim_GetLong (Jim_Interp *interp, Jim_Obj *objPtr,
         long *longPtr);
+
 #define Jim_NewWideObj  Jim_NewIntObj
+
 JIM_EXPORT Jim_Obj * Jim_NewIntObj (Jim_Interp *interp,
         jim_wide wideValue);
 
 
+
 JIM_EXPORT int Jim_GetDouble(Jim_Interp *interp, Jim_Obj *objPtr,
         double *doublePtr);
+
 JIM_EXPORT void Jim_SetDouble(Jim_Interp *interp, Jim_Obj *objPtr,
         double doubleValue);
+
 JIM_EXPORT Jim_Obj * Jim_NewDoubleObj(Jim_Interp *interp, double doubleValue);
 
 
+
 JIM_EXPORT void Jim_WrongNumArgs (Jim_Interp *interp, int argc,
         Jim_Obj *const *argv, const char *msg);
 JIM_EXPORT int Jim_GetEnum (Jim_Interp *interp, Jim_Obj *objPtr,
         const char * const *tablePtr, int *indexPtr, const char *name, int flags);
+
 JIM_EXPORT int Jim_CheckShowCommands(Jim_Interp *interp, Jim_Obj *objPtr,
         const char *const *tablePtr);
+
 JIM_EXPORT int Jim_ScriptIsComplete(Jim_Interp *interp,
         Jim_Obj *scriptObj, char *stateCharPtr);
 
@@ -947,57 +1134,100 @@ JIM_EXPORT int Jim_FindByName(const char *name, const char * const array[], size
 
 
 typedef void (Jim_InterpDeleteProc)(Jim_Interp *interp, void *data);
+
 JIM_EXPORT void * Jim_GetAssocData(Jim_Interp *interp, const char *key);
+
 JIM_EXPORT int Jim_SetAssocData(Jim_Interp *interp, const char *key,
         Jim_InterpDeleteProc *delProc, void *data);
+
 JIM_EXPORT int Jim_DeleteAssocData(Jim_Interp *interp, const char *key);
+
 JIM_EXPORT int Jim_CheckAbiVersion(Jim_Interp *interp, int abi_version);
 
 
 
 
+
 JIM_EXPORT int Jim_PackageProvide (Jim_Interp *interp,
         const char *name, const char *ver, int flags);
+
 JIM_EXPORT int Jim_PackageRequire (Jim_Interp *interp,
         const char *name, int flags);
+
 #define Jim_PackageProvideCheck(INTERP, NAME) \
         if (Jim_CheckAbiVersion(INTERP, JIM_ABI_VERSION) == JIM_ERR || Jim_PackageProvide(INTERP, NAME, "1.0", JIM_ERRMSG)) \
                 return JIM_ERR
 
 
+
 JIM_EXPORT void Jim_MakeErrorMessage (Jim_Interp *interp);
 
 
+
 JIM_EXPORT int Jim_InteractivePrompt (Jim_Interp *interp);
+
 JIM_EXPORT void Jim_HistoryLoad(const char *filename);
+
 JIM_EXPORT void Jim_HistorySave(const char *filename);
+
 JIM_EXPORT char *Jim_HistoryGetline(Jim_Interp *interp, const char *prompt);
+
 JIM_EXPORT void Jim_HistorySetCompletion(Jim_Interp *interp, Jim_Obj *completionCommandObj);
+
 JIM_EXPORT void Jim_HistorySetHints(Jim_Interp *interp, Jim_Obj *hintsCommandObj);
+
 JIM_EXPORT void Jim_HistoryAdd(const char *line);
+
 JIM_EXPORT void Jim_HistoryShow(void);
+
 JIM_EXPORT void Jim_HistorySetMaxLen(int length);
+
 JIM_EXPORT int Jim_HistoryGetMaxLen(void);
 
 
+
 JIM_EXPORT int Jim_InitStaticExtensions(Jim_Interp *interp);
+
 JIM_EXPORT int Jim_StringToWide(const char *str, jim_wide *widePtr, int base);
+
 JIM_EXPORT int Jim_IsBigEndian(void);
 
 #define Jim_CheckSignal(i) ((i)->signal_level && (i)->sigmask)
+
 JIM_EXPORT void Jim_SignalSetIgnored(jim_wide mask);
 
 
+
 JIM_EXPORT int Jim_LoadLibrary(Jim_Interp *interp, const char *pathName);
+
 JIM_EXPORT void Jim_FreeLoadHandles(Jim_Interp *interp);
 
 
+
 JIM_EXPORT int Jim_AioFilehandle(Jim_Interp *interp, Jim_Obj *command);
 
 
+
 JIM_EXPORT int Jim_IsDict(Jim_Obj *objPtr);
+
 JIM_EXPORT int Jim_IsList(Jim_Obj *objPtr);
 
+
+JIM_EXPORT void Jim_SetTaintError(Jim_Interp *interp, int cmdargs, Jim_Obj *const *argv);
+JIM_EXPORT int Jim_CalcTaint(int argc, Jim_Obj *const *argv);
+
+#ifdef JIM_TAINT
+#define Jim_CheckTaint(i, t) ((i)->taint & (t))
+#define Jim_TaintObj(o,t) (o)->taint |= (t)
+#define Jim_UntaintObj(o) (o)->taint = 0
+#define Jim_GetObjTaint(o) (o)->taint
+#else
+#define Jim_CheckTaint(i, t) 0
+#define Jim_TaintObj(o,t)
+#define Jim_UntaintObj(o)
+#define Jim_GetObjTaint(o) 0
+#endif
+
 #ifdef __cplusplus
 }
 #endif
@@ -1015,6 +1245,10 @@ extern "C" {
 
 #define JIM_MODFLAG_HIDDEN   0x0001
 #define JIM_MODFLAG_FULLARGV 0x0002
+#define JIM_MODFLAG_NOTAINT  0x0004
+
+#define JIM_SUBCMD_BADARGS -1
+#define JIM_SUBCMD_TAINTED -2
 
 
 
@@ -1041,6 +1275,9 @@ int Jim_CallSubCmd(Jim_Interp *interp, const jim_subcmd_type *ct, int argc, Jim_
 
 void Jim_SubCmdArgError(Jim_Interp *interp, const jim_subcmd_type *ct, Jim_Obj *subcmd);
 
+Jim_Cmd *Jim_RegisterSubCmd(Jim_Interp *interp, const char *cmdname,
+	const jim_subcmd_type *command_table, Jim_DelCmdProc *delProc);
+
 #ifdef __cplusplus
 }
 #endif
@@ -1074,6 +1311,7 @@ typedef struct regexp {
 	int regmust;
 	int regmlen;
 	int *program;
+	char *exp;
 
 
 	const char *regparse;
@@ -1094,10 +1332,14 @@ typedef struct regexp {
 typedef regexp regex_t;
 
 #define REG_EXTENDED 0
-#define REG_NEWLINE 1
 #define REG_ICASE 2
+#define REG_NEWLINE_ANCHOR 4
+#define REG_NEWLINE_STOP 8
+
+#define REG_NEWLINE (REG_NEWLINE_ANCHOR | REG_NEWLINE_STOP)
 
 #define REG_NOTBOL 16
+#define REG_EXPANDED 32
 
 enum {
 	REG_NOERROR,
@@ -1408,8 +1650,8 @@ int Jim_initjimshInit(Jim_Interp *interp)
 "\n"
 "proc tcl::stdhint {string} {\n"
 "	set result \"\"\n"
+"	lassign $string cmd arg\n"
 "	if {[llength $string] >= 2} {\n"
-"		lassign $string cmd arg\n"
 "		if {$cmd in $::tcl::stdhint_commands || [info channel $cmd] ne \"\"} {\n"
 "			catch {\n"
 "				set help [$cmd -help $arg]\n"
@@ -1431,6 +1673,23 @@ int Jim_initjimshInit(Jim_Interp *interp)
 "				}\n"
 "			}\n"
 "		}\n"
+"	} else {\n"
+"		catch {\n"
+"			if {[exists -alias $cmd] && [llength [info alias $cmd]] == 1} {\n"
+"\n"
+"\n"
+"\n"
+"				set help [info usage [info alias $cmd]]\n"
+"			} else {\n"
+"				set help [info usage $cmd]\n"
+"			}\n"
+"			set hint [join [lrange $help 1 end]]\n"
+"			set prefix \" \"\n"
+"			if {[string match \"* \" $string]} {\n"
+"				set prefix \"\"\n"
+"			}\n"
+"			set result [list $prefix$hint {*}$::tcl::stdhint_col]\n"
+"		}\n"
 "	}\n"
 "	return $result\n"
 "}\n"
@@ -1894,7 +2153,9 @@ int Jim_tclcompatInit(Jim_Interp *interp)
 "\n"
 "\n"
 "\n"
*** 29621 LINES SKIPPED ***