Fix parsing of options to the .once command.

FossilOrigin-Name: fd21b079e9ded037f9ec65f04864684060b8b80d034dfc9b07e01b5a1f75d79a

diff --git a/manifest b/manifest
index 485c38c35154be76a3c7870e944f1e226a8e17cf..4de1f6448423ac03caf2aaa498dc7c59cf7395b1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\snumber\sto\s3.53.1
-D 2026-04-15T19:09:34.971
+C Fix\sparsing\sof\soptions\sto\sthe\s.once\scommand.
+D 2026-04-17T01:55:29.492
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -735,7 +735,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576
-F src/shell.c.in 846bc359191ccfa2b905650e8adde5e35d0a0bf4d7e170c8559372a34e9f7d7a
+F src/shell.c.in 4edf6ba701a13c0b9c519a56b33548a6519d5e67ebb683ba7e253d28543d04d0
 F src/sqlite.h.in e2915e4a86d5e0783afb5cb72411df38d987c7f3c5aa2d5441b8e74d30b649d8
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca
@@ -2197,8 +2197,9 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P dceee93ab38a623a6c94658583ad6e012e141d5a4eaa91b074de06e175cb4175
-R 7175bfc55ee6a124cb71b7014f30b55e
+P b4c1cc5efcc1e538ed71ffd847030d80ab03fe6e6785f14fbad7f6079321d199
+Q +b235a8093734f457c2731af017c99027510d04e5cd1060f5559afbec5409a472
+R 9c76e1fc87040c0e5f7aa24ed9df8ca1
 U drh
-Z c3b1b90a19b76cb435d9f8b55bd4aecc
+Z 8fcb3a77a5f1ff6a5355c5979bf61c7f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 97ec34f0d795965c777c2566a20dcc1dd33b38a7..fc1ec6374ad3db11eda6abe1baeef7d348c8d9b1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b4c1cc5efcc1e538ed71ffd847030d80ab03fe6e6785f14fbad7f6079321d199
+fd21b079e9ded037f9ec65f04864684060b8b80d034dfc9b07e01b5a1f75d79a

diff --git a/src/shell.c.in b/src/shell.c.in
index a275373dd0b061605efb47fba8971a07662e8ce2..3394ffa64f043a572094546015c4300d01db943d 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8570,8 +8570,7 @@ static int dotCmdOutput(ShellState *p){
         zBom = zBomUtf8;
       }else if( cli_strcmp(z,"-plain")==0 ){
         bPlain = 1;
-      }else if( c=='o' && z[0]=='1' && z[1]!=0 && z[2]==0
-             && (z[1]=='x' || z[1]=='e' || z[1]=='w') ){
+      }else if( c=='o' && sqlite3_strglob("-[ewx]",z)==0 ){
         if( bKeep || eMode ){
           dotCmdError(p, i, "incompatible with prior options",0);
           goto dotCmdOutput_error;