Add a missing #if check for SQLITE_OMIT_LOAD_EXTENSION to shell.c.in, trigged by...

FossilOrigin-Name: 1091f3371f4af75344c2e6da26656c259fa96c8a8da9acde3db79df8aa95fd0a

diff --git a/manifest b/manifest
index b825a3333b7feda853c8cb359c1d50f09e48e2b6..ba345276084141967bef926eedab16f150ea3262 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sbug\sfixes\sin\stmstmpvfs.c,\sshowdb.c,\sand\sshowtmlog.c.
-D 2026-01-08T15:25:04.189
+C Add\sa\smissing\s#if\scheck\sfor\sSQLITE_OMIT_LOAD_EXTENSION\sto\sshell.c.in,\strigged\sby\sthe\sfiddle\sbuild.
+D 2026-01-08T15:26:19.338
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -738,7 +738,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 47aa7fdc9ec4c19b103ac5e79d7887d30119b5675309facf5eed1118391c868b
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4d45a04431db072040d6625ee21c1dc483c9b2b64a5ab419f4a4e05aabed1204
-F src/shell.c.in 6c4f20a4787933b0a5fce307b7d9d67e00805966a52186f0c2cd04d75691c38b
+F src/shell.c.in 3bc4c6aa962bdf950dc144c2138eb4bc734bf7e305f2ac42dbda5a83c4a4c660
 F src/sqlite.h.in 476f3efeb5dd26ad94dcbce262ca7eb9d042d797a92d624059c67ef37d5b3ab4
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998
@@ -2191,8 +2191,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P e14d9a980351a8d5e935e6991ea02a1c40c9ea8f0ad0fadcabe07d575a9b289c
-R 5732f9b90659e548d32a735de971cff5
-U drh
-Z af5bc160622d940e12d2af419055b1c0
+P 1fee8265f7eab649ee8b28456c37d95198f5cde54e905154e3eccc0b328ece9a
+R fe4ee4892cd00e82736e5e46be687a34
+U stephan
+Z 9dd4f85e828d41aa6fa3065c0d3c9df1
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 79dd7159a307bfae42144ecc32099e4e766a751a..1a9fbe87396db533b27de97d950a96300352f5ae 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fee8265f7eab649ee8b28456c37d95198f5cde54e905154e3eccc0b328ece9a
+1091f3371f4af75344c2e6da26656c259fa96c8a8da9acde3db79df8aa95fd0a

diff --git a/src/shell.c.in b/src/shell.c.in
index d022517ec595922119fbcaabea91465a15f87de1..4ef9f28ee69739f6daccae5902383518e75d6c5c 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -39,6 +39,10 @@ typedef unsigned short int u16;
 ** and this build mode rewires the user input subsystem to account for
 ** that.
 */
+#if defined(SQLITE_SHELL_FIDDLE)
+# undef SQLITE_OMIT_LOAD_EXTENSION
+# define SQLITE_OMIT_LOAD_EXTENSION 1
+#endif
 
 /*
 ** Warning pragmas copied from msvc.h in the core.
@@ -13023,7 +13027,9 @@ int SQLITE_CDECL main(int argc, char **argv){
     sqlite3_vfs *pVfs = sqlite3_vfs_find(zVfs);
     if( pVfs ){
       sqlite3_vfs_register(pVfs, 1);
-    }else if( access(zVfs,0)==0 ){
+    }
+#if !defined(SQLITE_OMIT_LOAD_EXTENSION)
+    else if( access(zVfs,0)==0 ){
       /* If the VFS name is not the name of an existing VFS, but it is
       ** the name of a file, then try to load that file as an extension.
       ** Presumably the extension implements the desired VFS. */
@@ -13038,7 +13044,9 @@ int SQLITE_CDECL main(int argc, char **argv){
                    zVfs, zErr);
         exit(1);
       }
-    }else{
+    }
+#endif
+    else{
       cli_printf(stderr,"no such VFS: \"%s\"\n", zVfs);
       exit(1);
     }