From: stephan Date: Fri, 10 Apr 2026 08:39:51 +0000 (+0000) Subject: Correct shell result code propagation regression introduced in [ff084ae341eab5c4... X-Git-Tag: version-3.53.1~24 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=282e2cea0a76e0651f61d837547bcbb1206cc9ca;p=thirdparty%2Fsqlite.git Correct shell result code propagation regression introduced in [ff084ae341eab5c4] and reported in [forum:6fa3247e9724844c|forum post 6fa3247e9724844c]. FossilOrigin-Name: 5306da4231efcaf1bd7afa3cdcfcb87edf70958e3dd2edaed765a0d844e3be03 --- diff --git a/manifest b/manifest index f875b8a5a8..0306a91612 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s3.53.0 -D 2026-04-09T11:41:38.498 +C Correct\sshell\sresult\scode\spropagation\sregression\sintroduced\sin\s[ff084ae341eab5c4]\sand\sreported\sin\s[forum:6fa3247e9724844c|forum\spost\s6fa3247e9724844c]. +D 2026-04-10T08:39:51.122 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,11 +2197,12 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P cda5dd9bcbef2135bb9855139a11d0e22a092f9498d82eb18e7d4401264b6eb8 -R 78f8c181262c6bdd7ab10b5492ff03ea -T +sym-major-release * -T +sym-release * -T +sym-version-3.53.0 * -U drh -Z 5cc2d306947f7e965f5f798b08602c26 +P 4525003a53a7fc63ca75c59b22c79608659ca12f0131f52c18637f829977f20b +Q +a76682a3b1d6c5e8ca16caf8afbe545c9ae39849fe21ba68d4cddae683a409b5 +R d0079594d8c2ed9694e8861b1becf746 +T *branch * branch-3.53 +T *sym-branch-3.53 * +T -sym-trunk * +U stephan +Z 690258fba0f78f9dd35af2160ed308f1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.tags b/manifest.tags index 368ef71f65..8d97ab7c23 100644 --- a/manifest.tags +++ b/manifest.tags @@ -1,5 +1,2 @@ -branch trunk -tag trunk -tag release -tag major-release -tag version-3.53.0 +branch branch-3.53 +tag branch-3.53 diff --git a/manifest.uuid b/manifest.uuid index dd0205708e..6899ac93d6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4525003a53a7fc63ca75c59b22c79608659ca12f0131f52c18637f829977f20b +5306da4231efcaf1bd7afa3cdcfcb87edf70958e3dd2edaed765a0d844e3be03 diff --git a/src/shell.c.in b/src/shell.c.in index b121ed8363..9f67675a15 100644 --- 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);