Less error-prone parsing of ".once" options. Fix for the problem reported

by [forum:/info/2026-04-17T01:26:56Z|forum post 2026-04-17T01:26:56Z].

FossilOrigin-Name: b235a8093734f457c2731af017c99027510d04e5cd1060f5559afbec5409a472

diff --git a/manifest b/manifest
index 0e916803859327b3854fa769d337d8147cec8364..ec65164b2f290340e11adc63b3054eee37ef744d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stestrunner.tcl\sso\sthat\sit\sdoes\snot\screate\sdirectories\swith\snames\nending\sin\s"sqlite3.o"\sor\s"sqlite3.lo".\s\sUse\s"sqlite3obj"\sfor\sthose\ndirectory\snames\sinstead.\s\sOtherwise\s"make\sclean"\sgets\sconfused.
-D 2026-04-16T19:50:52.858
+C Less\serror-prone\sparsing\sof\s".once"\soptions.\s\sFix\sfor\sthe\sproblem\sreported\nby\s[forum:/info/2026-04-17T01:26:56Z|forum\spost\s2026-04-17T01:26:56Z].
+D 2026-04-17T01:50:40.615
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -736,7 +736,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 486029de07dea8dbe2c43cd7c86a35257f586894df9716c5998b95a4c96f655a
+F src/shell.c.in 88bb0ac5dd5787a38165754a2f82082d8d31467ef561d35377294a92415ca211
 F src/sqlite.h.in 39d2e09114d2bdb7afd998f4a469c8f8cd065f8093835a7d0422f260fc78fb4f
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
@@ -2201,8 +2201,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 8d820b0ccfccff94ed5b7297fa587ac27a74e990f233cfe229da7409ab2e3af8
-R a2bdadf3da1687db023a8d77f4881eab
+P a4bf9289c9cdb12b22bfb24e7e2b0243384e9edece12ae3fed14afbfe9b93260
+R 0f63c4268db1999bde9ac472d751de9a
 U drh
-Z 25db714ee66b7ef3d65724bd2119ddd7
+Z b2d06a4c32b45078b0f11c43a3f1e77d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e2914518633e3cdf90ff125ac599dbbc40bdbef2..e49bbe4828617fc6a082f6302113c3e994078202 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4bf9289c9cdb12b22bfb24e7e2b0243384e9edece12ae3fed14afbfe9b93260
+b235a8093734f457c2731af017c99027510d04e5cd1060f5559afbec5409a472

diff --git a/src/shell.c.in b/src/shell.c.in
index cd4d147540012b824f5da1bf092768e2b8032eff..feb112fb9659e0d9e51f07e8cb35775943e99fd8 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -8810,8 +8810,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;