From: drh <> Date: Sat, 11 Apr 2026 22:18:05 +0000 (+0000) Subject: Two C-preprocessor macros SQLITE_PS1 and SQLITE_PS2 can be set to override X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1e3f888acf907eaf856e99efe923755b82c2d924;p=thirdparty%2Fsqlite.git Two C-preprocessor macros SQLITE_PS1 and SQLITE_PS2 can be set to override the default prompt strings in the CLI. FossilOrigin-Name: 6fa0216a19c2f165110121227d3f9b9119369f8cd61f9c6d13eaa1ae42a60d60 --- diff --git a/manifest b/manifest index 7b4bf96a37..222e2e319c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\ssqlite3_incomplete()\savailable\sto\sextensions. -D 2026-04-11T20:53:53.734 +C Two\sC-preprocessor\smacros\sSQLITE_PS1\sand\sSQLITE_PS2\scan\sbe\sset\sto\soverride\nthe\sdefault\sprompt\sstrings\sin\sthe\sCLI. +D 2026-04-11T22:18:05.507 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 bed26ce3998b32fde83acbf7f4af3bd9e64902bec6bbfa1a834c9f30497b7231 +F src/shell.c.in ec0603f2c689611761c0158b03945b45be1f82458faf24c98a22efb0392e2e1c F src/sqlite.h.in a5605faa9479bbaac16c4ab43eb09ff50632004a8e05084d3fde56063ef73766 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e @@ -2198,8 +2198,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P d64f0c8845104008d6c251f9a1406c6ff717a916c13b64014aa1d154501d5fab -R 45d7c60267b13972f0ab4dce051b695d +P 50d81300ba0f021f388aab1e86e97d688ed762cee408c610cf70977f7b488803 +R ce155f157db3345b96c76c7aebb15cce U drh -Z 42a52aa93a60133b1826fa4cd9707451 +Z c75826f50d2605e4feec81bbbbe95eef # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 95ef4989d9..75061e0b85 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -50d81300ba0f021f388aab1e86e97d688ed762cee408c610cf70977f7b488803 +6fa0216a19c2f165110121227d3f9b9119369f8cd61f9c6d13eaa1ae42a60d60 diff --git a/src/shell.c.in b/src/shell.c.in index 095b666da9..e5fb186b48 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -907,6 +907,16 @@ static char *local_getline(char *zLine, FILE *in){ return zLine; } +/* +** The default prompts. +*/ +#ifndef SQLITE_PS1 +# define SQLITE_PS1 "SQLite \\f> " +#endif +#ifndef SQLITE_PS2 +# define SQLITE_PS2 "\\B...\\H> " +#endif + /* ** Return the raw (unexpanded) prompt string. This will be the ** first of the following that exist: @@ -929,9 +939,9 @@ static const char *prompt_string(ShellState *p, int bContinue){ if( zPS ) return zPS; #endif if( bContinue ){ - return "\\B...\\H> "; + return SQLITE_PS2; }else{ - return "SQLite \\f> "; + return SQLITE_PS1; } }