From: dan Date: Tue, 20 Jan 2026 18:30:48 +0000 (+0000) Subject: Update the shell tool to work with SQLITE_OMIT_AUTOINIT builds. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca0b14a4906fc0e247818078f4526b90a5caa03c;p=thirdparty%2Fsqlite.git Update the shell tool to work with SQLITE_OMIT_AUTOINIT builds. FossilOrigin-Name: 2b3b36da9d60c265dceec5964ea51c752d81f41459fb6849c8faea658b253552 --- diff --git a/manifest b/manifest index f5a7b2da15..3b32deaf96 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Tiny\sJS\sdoc\stouchup. -D 2026-01-20T18:07:27.521 +C Update\sthe\sshell\stool\sto\swork\swith\sSQLITE_OMIT_AUTOINIT\sbuilds. +D 2026-01-20T18:30:48.704 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -739,7 +739,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 3bc4c6aa962bdf950dc144c2138eb4bc734bf7e305f2ac42dbda5a83c4a4c660 +F src/shell.c.in 399df56c81dbf51bfa0df73094344e2bf76a443bb7fba729b616ab3d0b769f34 F src/sqlite.h.in 476f3efeb5dd26ad94dcbce262ca7eb9d042d797a92d624059c67ef37d5b3ab4 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h f590cd8cb4c36fc727632c9b5fbbafc85f7efe2c6890f9958d7e711dc26ec01e @@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 982a91abc0c97e7e785d3ba69a4d0516a899f4d6cd462027ebdf7115e577e8c3 -R 6ff13f00cf6c41d0c4a81cea081d1bc8 -U stephan -Z af44c4e73ad1224fb4e3cf792d311520 +P 6d9ec0a21a2b33a7bb3cf9c3677c9ef7a9738d318cd2d8159b33583b2bd4abec +R d8076aa16a2c760d1df8cf8a346c126f +U dan +Z 909c03dd33b70fa520b61311ab3de8ab # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 055bcc097b..2d01da9535 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6d9ec0a21a2b33a7bb3cf9c3677c9ef7a9738d318cd2d8159b33583b2bd4abec +2b3b36da9d60c265dceec5964ea51c752d81f41459fb6849c8faea658b253552 diff --git a/src/shell.c.in b/src/shell.c.in index 4ef9f28ee6..8676744c1d 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -4244,7 +4244,9 @@ static int isScriptFile(const char *z, int bLeaveUninit){ sqlite3_int64 sz = fileSize(z); if( sz<=0 ) return 0; if( (sz%512)==0 ){ - int rc = isDatabaseFile(z, SQLITE_OPEN_READONLY); + int rc; + sqlite3_initialize(); + rc = isDatabaseFile(z, SQLITE_OPEN_READONLY); if( bLeaveUninit ){ sqlite3_shutdown(); }