Correct shell result code propagation regression introduced in [ff084ae341eab5c4...

FossilOrigin-Name: a76682a3b1d6c5e8ca16caf8afbe545c9ae39849fe21ba68d4cddae683a409b5

diff --git a/manifest b/manifest
index 71e45fdc377a38bcd48d61e4a592ae5cfe5f01cd..98a5df1bd69cc8b98e37ea578062cadbb4b3dced 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sO_TMPFILE\s(on\ssystems\sthat\ssupport\sit)\sto\ssecurity\screate\sa\stemporary\nfile\sthat\sis\sinaccessible\sto\sany\sother\sprocess.
-D 2026-04-09T16:16:39.462
+C Correct\sshell\sresult\scode\spropagation\sregression\sintroduced\sin\s[ff084ae341eab5c4]\sand\sreported\sin\s[forum:6fa3247e9724844c|forum\spost\s6fa3247e9724844c].
+D 2026-04-10T08:36:55.583
 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 a3288615aba1b375f7dca9801874c806e8d0d047dfe4e9253a944f4b47c7459e
+F src/shell.c.in 4d00b373ce9485b5f2db2dbebf3a6a3ef3ebe7b77fc7ecb3278cae2cb4a5529b
 F src/sqlite.h.in e2915e4a86d5e0783afb5cb72411df38d987c7f3c5aa2d5441b8e74d30b649d8
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca
@@ -2197,9 +2197,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 450c7edf1247024db4b66f38bf9561c5c6b0c4175c4df8de17019aea6cbde5cf 094fc6da0768ea0ec4b4d3dc020cd6025aab341550d6cea6be7487ac570f9171
-R 3859e15f84d69d9c5d2ca3a8aab9bbbc
-T +closed 094fc6da0768ea0ec4b4d3dc020cd6025aab341550d6cea6be7487ac570f9171
-U drh
-Z f2afa9c19f08115f7108ad30dacf8d8a
+P 4609ba34b8b4a6df4cd28e39d19f96e59580db0e838f1aa605cc00ea003c2a85
+R ef99f5128a13f6e0e0691d2c36c077e8
+U stephan
+Z db7408842f3f5a03e701ec77d60fda32
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3b6dd0b9aae0b4fa68a35c6666096eb860265e43..b50d78d4e32733f047000e60a71cc887fc67d666 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4609ba34b8b4a6df4cd28e39d19f96e59580db0e838f1aa605cc00ea003c2a85
+a76682a3b1d6c5e8ca16caf8afbe545c9ae39849fe21ba68d4cddae683a409b5

diff --git a/src/shell.c.in b/src/shell.c.in
index b121ed8363fad4b82cbb4f0a96c3e4aa1527df5a..9f67675a15b89939b84ee56dce5142d5158b6c96 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -13555,6 +13555,10 @@ int SQLITE_CDECL main(int argc, char **argv){
           modePop(&data);
           data.nPopMode = 0;
         }
+        if( rc ){
+          goto shell_main_exit;
+        }
+
       }
       if( data.nPopOutput && azCmd[i][0]!='.' ){
         output_reset(&data);