Add the -no-utf8 option to the Windows CLI to cause UTF-8 mode to be omitted.

FossilOrigin-Name: 4cb799c690986b8bd38d07461998824fa53418f7fe31f59d0bf38cae328d9b89

diff --git a/manifest b/manifest
index ae42d9a95fe1ce855b82943c20e330847f43575f..e076aac5349540e591ca19c14a3aae73a64eb6e3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\s-utf8\soption\sthe\sdefault\sbehavior\sin\sthe\sCLI\son\sWindows\sfor\s64-bit\nbuilds.
-D 2023-09-11T20:02:38.411
+C Add\sthe\s-no-utf8\soption\sto\sthe\sWindows\sCLI\sto\scause\sUTF-8\smode\sto\sbe\somitted.
+D 2023-09-11T20:09:05.421
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c e9fb48546ab1882639a3a960383f6342dddb776c0227615f8e19de51f0102f68
-F src/shell.c.in 965c53a121c9912c69a6f57614c89849f10089f5e13931caf01d0eab921da135
+F src/shell.c.in 06318a3214ca2d88e8dc2df5c3e0cc2b0645c0b14b5dbee262cb2a5131e62b28
 F src/sqlite.h.in 931a58d119d5cf87110648f39fa0bb9f1738b0068cb68250d893304a471bd6c0
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 2f30b2671f4c03cd27a43f039e11251391066c97d11385f5f963bb40b03038ac
@@ -2119,11 +2119,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3308fdda4b81c110ba4a66d0b325e7653c2f8155e7864aeb78991ed1da061836
-R 749ff62c06f0f9de87d1bcc645a12c81
-T *branch * cli-utf8
-T *sym-cli-utf8 *
-T -sym-trunk *
+P 8b3c306def81546c5987f0f245d2bf3960218254c2833e9c27cd242e9118db62
+R aa2246bfa71d260543ebc443b2a9859c
 U drh
-Z 09a2b4287b6e681a2e740721f0702888
+Z f1217d3417861556ad9d239a29797644
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 59bff84a09a2148dc12970ff459412c5fbf7c587..eaccf788ebcde5cd329bd9da4b9986f1dd0a4817 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b3c306def81546c5987f0f245d2bf3960218254c2833e9c27cd242e9118db62
\ No newline at end of file
+4cb799c690986b8bd38d07461998824fa53418f7fe31f59d0bf38cae328d9b89
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 7dd3d85ceca711dfcd88b92144fb889ff29bb6d3..70cc226a433b01a5c5947d4f3d6ed12f4a9a85f3 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -11924,6 +11924,9 @@ static const char zOptions[] =
   "   -multiplex           enable the multiplexor VFS\n"
 #endif
   "   -newline SEP         set output row separator. Default: '\\n'\n"
+#if SHELL_WIN_UTF8_OPT
+  "   -no-utf8             do not try to set up UTF-8 output (for legacy)\n"
+#endif     
   "   -nofollow            refuse to open symbolic links to database files\n"
   "   -nonce STRING        set the safe-mode escape nonce\n"
   "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
@@ -12490,6 +12493,10 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
     }else if( cli_strcmp(z,"-utf8")==0 ){
 #if SHELL_WIN_UTF8_OPT
       console_utf8 = 1;
+#endif /* SHELL_WIN_UTF8_OPT */
+    }else if( cli_strcmp(z,"-no-utf8")==0 ){
+#if SHELL_WIN_UTF8_OPT
+      console_utf8 = 0;
 #endif /* SHELL_WIN_UTF8_OPT */
     }else if( cli_strcmp(z,"-heap")==0 ){
       i++;