From: drh <> Date: Sun, 17 May 2026 19:21:30 +0000 (+0000) Subject: Fix the ".prompt" command so that it honors -bail. X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=fd88eed8fa50e6ccb565379054ea9344cc6b0306;p=thirdparty%2Fsqlite.git Fix the ".prompt" command so that it honors -bail. FossilOrigin-Name: 5b58bdd33f0410624523fc8adc230db4e5f57283d234a5f0d26a2790629bc0f9 --- diff --git a/manifest b/manifest index acec4b3403..e848ddfd1e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\snew\s%J\sand\s%j\sformats\sso\sthey\swork\scorrectly\swith\sa\szero\sprecision. -D 2026-05-17T17:50:32.913 +C Fix\sthe\s".prompt"\scommand\sso\sthat\sit\shonors\s-bail. +D 2026-05-17T19:21:30.849 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -737,7 +737,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 11134922dfc2c89d10c658a1ae9ae9e1af0df031d40b9e9171dc14d3f2e6d80f F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 4c05cde130f26991b7411d8c6809e0630625e18078742c963a047b4b9cc01d49 -F src/shell.c.in beb97bb27bed3cf1775cee13a3cae4d05e5f8437e2eaf88d297399dec26ce645 +F src/shell.c.in 9dcc77636cdc48d67ea0cd7f4d54d791202e435e05598ec0a147cd61269e1c4d F src/sqlite.h.in 749454ec71c875bc130d399ff9a7e47191d143d1b9d8b4af3839b6028df9eda9 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e @@ -2205,8 +2205,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 460243ee4c28873d5c484a91af7ec18d03d0e726b8bb4e1e680b588e5f371400 -R 4ab039991f1dfd6448b3b6eff65cdf8e +P 428b924dd6e228c879338c5c5edbe68bdc4d8d8e80c37e3d070a8a34b57300c1 +R 45743be3881e9dd4a1338be1e4981af8 U drh -Z 55129b23e367acb13737c409d6be9ea1 +Z e207268a53a92181f505449dfe914b46 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7a222e9025..eb8dfc6c1a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -428b924dd6e228c879338c5c5edbe68bdc4d8d8e80c37e3d070a8a34b57300c1 +5b58bdd33f0410624523fc8adc230db4e5f57283d234a5f0d26a2790629bc0f9 diff --git a/src/shell.c.in b/src/shell.c.in index 837045d022..e4a9364854 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -11135,6 +11135,7 @@ static int do_meta_command(const char *zLine, ShellState *p){ goto meta_command_exit; }else if( !p->dot.abQuot[i] && sqlite3_strglob("*[^a-z]*",z)!=0 ){ dotCmdError(p, i, "use quotes around the prompt string", 0); + rc = 1; }else{ free(p->azPrompt[cnt]); p->azPrompt[cnt] = strdup(z);