From: drh <>
Date: Tue, 25 Feb 2025 15:57:49 +0000 (+0000)
Subject: Enhancements to help avoid problems in the CLI when trying display content
X-Git-Tag: major-release~241
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87ad172c50acbf0564368e7131d8f8611dadd303;p=thirdparty%2Fsqlite.git

Enhancements to help avoid problems in the CLI when trying display content
that contains ANSI escape codes:  (1) Add the --escape MODE option to the CLI
where MODE is one of "symbol", "ascii", "off" where the default is "symbol".
(2) Add the unistr() SQL function.  (3) Add the unistr_quote() SQL function.
(4) Add the %#Q and %#q conversions in the built-in printf.

FossilOrigin-Name: e3e509ae145ee2623ac68ededa59991a97fcd28313e03f67a3890b560c5381b0
---

87ad172c50acbf0564368e7131d8f8611dadd303
diff --cc manifest
index 474f313267,a1f57c8112..4c076a42b3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Diverse\sconfigure\stweaks\sto\sbetter\ssupport\spackage\smaintainers\son\sthe\sunix-on-windows\senvironments\slike\smsys2,\scygwin,\sand\smingw,\sbased\slargely\son\sfeedback\sin\sforum\sposts\s[forum:e6cf2bbb70da2922|e6cf2bbb70da2922]\sand\s[forum:828fdfe9041fd725|828fdfe9041fd725].
- D 2025-02-25T15:54:07.384
 -C Small\sperformance\simprovement\sfor\sthe\snew\s%#Q\sconversion\sin\sprintf.
 -D 2025-02-25T12:18:27.029
++C Enhancements\sto\shelp\savoid\sproblems\sin\sthe\sCLI\swhen\strying\sdisplay\scontent\nthat\scontains\sANSI\sescape\scodes:\s\s(1)\sAdd\sthe\s--escape\sMODE\soption\sto\sthe\sCLI\nwhere\sMODE\sis\sone\sof\s"symbol",\s"ascii",\s"off"\swhere\sthe\sdefault\sis\s"symbol".\n(2)\sAdd\sthe\sunistr()\sSQL\sfunction.\s\s(3)\sAdd\sthe\sunistr_quote()\sSQL\sfunction.\n(4)\sAdd\sthe\s%#Q\sand\s%#q\sconversions\sin\sthe\sbuilt-in\sprintf.
++D 2025-02-25T15:57:49.285
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -782,11 -782,11 +782,11 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c
- F src/shell.c.in bf997e43faaa1ef0ff78d4d7b9be6a9430cf1edda9a47a14e7fef646fcb459af
+ F src/shell.c.in 19cde2832968fff4d26a75b40b3af1ad7744dfeb0023467f4100849e23a81ce0
 -F src/sqlite.h.in 8d4486fb28a90de818ac1e8c6206ea458e7de6bd8e0dfa3d554494f155be8c01
 +F src/sqlite.h.in 95c01911006f42019ee4dacd62101740a75fdfaeeca9b1c5fd7a70cfac3bb6f8
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
- F src/sqliteInt.h c997c67257778a3a866424adea36d4f2b4439742a978c0ddc11e694c1e9ea3ca
 -F src/sqliteInt.h 674ba4569567f1773f0e4b84fa1c766d497da4e43c68aa2647755a5e61b7bacc
++F src/sqliteInt.h 130217107c0425ab43d098c6eadf8aa2e1a037e26d79384127e2d950b27eec77
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1638,7 -1638,7 +1638,7 @@@ F test/sharedA.test 64bdd21216dda2c6a3b
  F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707
  F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test ccb26a0cb17a73406b5e4fe3c3260988a22f5c63680d8474b4d35e9bc195f3cb
 -F test/shell1.test b9e7b85af3aa614536786f593684ca5317e356821ad505dad32afc2ea0e99f12
++F test/shell1.test 9f5ad2c80002175428eb375f020c4cec3d5053f244e5612ac317080cfb5b52a3
  F test/shell2.test 01a01f76ed98088ce598794fbf5b359e148271541a8ddbf79d21cc353cc67a24
  F test/shell3.test db1953a8e59d08e9240b7cc5948878e184f7eb2623591587f8fd1f1a5bd536d8
  F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807
@@@ -2212,9 -2211,8 +2213,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 277e150d6ab75de2407f6761aa2359df80a4e1dbce30788df06621dee05b2ef1 d84f591b962ea44efb902043444e4e54bc55e5bb32e5108f04df824407c412dd
- R 78c310a9a4af5ff9c75cc7a5fab1176b
- T +closed d84f591b962ea44efb902043444e4e54bc55e5bb32e5108f04df824407c412dd Closed\sby\sintegrate-merge.
- U stephan
- Z 5c4979a70508a4a3090e304de3c87f20
 -P 6208e494858b9d362efc7db4e8aac6f8e93fe51d2e038c94dfa97c55a74688a0
 -R 5e3cbac5c36e856b76f244c18c63cff3
++P 85b56fb0cce4b628f80b26a67b43236ef1557282775739bdbe7cc4d65948d66f 17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476
++R c94972830506b6b395965daf9af442ac
++T +closed 17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476
+ U drh
 -Z 71404ee027b8adeecdc3ccec4e60e22e
++Z 631ba5f922f8bda01c5446d2ca5a70ab
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 77b8d4895e,170b88d197..3d240e7aee
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 85b56fb0cce4b628f80b26a67b43236ef1557282775739bdbe7cc4d65948d66f
 -17e440781e68d7d3ea68c5144e1e08e183f0caef595a6c7ac4ce56489c60f476
++e3e509ae145ee2623ac68ededa59991a97fcd28313e03f67a3890b560c5381b0