From: drh <>
Date: Tue, 25 Feb 2025 18:10:47 +0000 (+0000)
Subject: Improved help messages for the --escape option in the CLI.
X-Git-Tag: major-release~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82769e7d04a7633f05e79777cf87472f3afb8b4e;p=thirdparty%2Fsqlite.git

Improved help messages for the --escape option in the CLI.

FossilOrigin-Name: e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7
---

diff --git a/manifest b/manifest
index 925e48deab..13cef0c5a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Configure\sscript\scosmetics:\semit\sthe\shost/build\ssystem\sinfo\sbefore\sthe\sdirectory\sinfo.
-D 2025-02-25T16:39:51.686
+C Improved\shelp\smessages\sfor\sthe\s--escape\soption\sin\sthe\sCLI.
+D 2025-02-25T18:10:47.123
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c
-F src/shell.c.in 19cde2832968fff4d26a75b40b3af1ad7744dfeb0023467f4100849e23a81ce0
+F src/shell.c.in 389d7c8cdc1c5322a81ff43df51434dc79a103e1948dad2b5efa3efe5f1a19c9
 F src/sqlite.h.in 95c01911006f42019ee4dacd62101740a75fdfaeeca9b1c5fd7a70cfac3bb6f8
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d284230f68616b78a527d34df777b0220376ba6a00e9e927d4ffb4cbddab900c
-R f4aaf63c39bb031c24a4e45f4e062b3e
-U stephan
-Z 34d3402ca6007d9c26a6383d8b273884
+P 6f0b6d95db17e69ac7e46a39f52770291ac4cfe43eea09add224946a6e11f04e
+R 7c090b4968aa0e8ac71166a84a710e20
+U drh
+Z 697ed46df73faf7261ac7cfa9611a38d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3fc69bae0b..f1e0b3d063 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f0b6d95db17e69ac7e46a39f52770291ac4cfe43eea09add224946a6e11f04e
+e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7
diff --git a/src/shell.c.in b/src/shell.c.in
index 40f07332c9..011c8c9847 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5130,7 +5130,7 @@ static const char *(azHelp[]) = {
 #else
   ".log on|off              Turn logging on or off.",
 #endif
-  ".mode MODE ?OPTIONS?     Set output mode",
+  ".mode ?MODE? ?OPTIONS?   Set output mode",
   "   MODE is one of:",
   "     ascii       Columns/rows delimited by 0x1F and 0x1E",
   "     box         Tables using unicode box-drawing characters",
@@ -5148,6 +5148,7 @@ static const char *(azHelp[]) = {
   "     tabs        Tab-separated values",
   "     tcl         TCL list elements",
   "   OPTIONS: (for columnar modes or insert mode):",
+  "     --escape T     ctrl-char escape; T is one of: symbol, ascii, off",
   "     --wrap N       Wrap output lines to no longer than N characters",
   "     --wordwrap B   Wrap or not at word boundaries per B (on/off)",
   "     --ww           Shorthand for \"--wordwrap 1\"",
@@ -12738,7 +12739,7 @@ static const char zOptions[] =
   "   -deserialize         open the database using sqlite3_deserialize()\n"
 #endif
   "   -echo                print inputs before execution\n"
-  "   -escape MODE         ctrl-char escape mode, one of: symbol, ascii, off\n"
+  "   -escape T            ctrl-char escape; T is one of: symbol, ascii, off\n"
   "   -init FILENAME       read/process named file\n"
   "   -[no]header          turn headers on or off\n"
 #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)