Show the "(utf8)" tag on the CLI banner in Windows if in UTF8 mode.

FossilOrigin-Name: 822699a4d9756ec68f17d6e06da7f994730bcf5c7d69ca15e9131721c4ff3b19

diff --git a/manifest b/manifest
index e076aac5349540e591ca19c14a3aae73a64eb6e3..f5f4480e9f4bc466d7b6c0a89d7d1838366f27b2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-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
+C Show\sthe\s"(utf8)"\stag\son\sthe\sCLI\sbanner\sin\sWindows\sif\sin\sUTF8\smode.
+D 2023-09-12T14:09:45.318
 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 06318a3214ca2d88e8dc2df5c3e0cc2b0645c0b14b5dbee262cb2a5131e62b28
+F src/shell.c.in 6c177bf142b0a2bf6a176b3f2a2d96e251ab235cb5ec02185a39a9d5c62884f8
 F src/sqlite.h.in 931a58d119d5cf87110648f39fa0bb9f1738b0068cb68250d893304a471bd6c0
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 2f30b2671f4c03cd27a43f039e11251391066c97d11385f5f963bb40b03038ac
@@ -2119,8 +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 8b3c306def81546c5987f0f245d2bf3960218254c2833e9c27cd242e9118db62
-R aa2246bfa71d260543ebc443b2a9859c
+P 4cb799c690986b8bd38d07461998824fa53418f7fe31f59d0bf38cae328d9b89
+R 3b371c0111613cd81f5e3055619f9b2e
 U drh
-Z f1217d3417861556ad9d239a29797644
+Z a21d459ccb9042dd5dd607f2f29c0b00
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index eaccf788ebcde5cd329bd9da4b9986f1dd0a4817..2e49737a5b1581499b88742c72e69c4e326392ff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cb799c690986b8bd38d07461998824fa53418f7fe31f59d0bf38cae328d9b89
\ No newline at end of file
+822699a4d9756ec68f17d6e06da7f994730bcf5c7d69ca15e9131721c4ff3b19
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 70cc226a433b01a5c5947d4f3d6ed12f4a9a85f3..2334872e5092c35ea2376f12ccf712954ae6d9c2 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12622,11 +12622,15 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
     if( stdin_is_interactive ){
       char *zHome;
       char *zHistory;
+      const char *zCharset = "";
       int nHistory;
+#if SHELL_WIN_UTF8_OPT
+      if( console_utf8 ) zCharset = " (utf8)";
+#endif
       printf(
-        "SQLite version %s %.19s\n" /*extra-version-info*/
+        "SQLite version %s %.19s%s\n" /*extra-version-info*/
         "Enter \".help\" for usage hints.\n",
-        sqlite3_libversion(), sqlite3_sourceid()
+        sqlite3_libversion(), sqlite3_sourceid(), zCharset
       );
       if( warnInmemoryDb ){
         printf("Connected to a ");