Fix the CLI so that the --bom option only outputs a single BOM, not two.

FossilOrigin-Name: 76b6331e6a705a420a64820a18214f07cf4c1d5151e7158d6fff09964e63f352

diff --git a/manifest b/manifest
index 203e87db27aaa724ebfc6c582da87c2a6d187b26..7566dedc21223fc849457d40856a5ff6b119963e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sanother\smissing\smkdir\sto\sthe\swasm\sbuild\sprocess.
-D 2024-09-28T15:13:49.994
+C Fix\sthe\sCLI\sso\sthat\sthe\s--bom\soption\sonly\soutputs\sa\ssingle\sBOM,\snot\stwo.
+D 2024-09-28T19:52:38.443
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -768,7 +768,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 9750a281f7ba073b4e6da2be1a6c4071f5d841a7746c5fb3f70d6d793b6675ea
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
-F src/shell.c.in 857c60ed21ae2c58d7740d790e8b22e167136ad1930af50527ec0e584a8cc8aa
+F src/shell.c.in 345173187067363374187176a8bbe779e359849e635d8288202000ee87f4405a
 F src/sqlite.h.in b20547021d20ba016c2fd0500f14f08a21ff23e64a0ed93e72ca0fecb9e1d0a0
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2213,8 +2213,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c9cbbeda3d1ec4215396aaaf94428b829c4f53329431fa61251914c195f8a9a1
-R 6a112f9240ce847c284940c2c71c0d81
-U stephan
-Z be8aef5e16db8f3b229b77cf96144050
+P e815055b321085deda8607ac3279ef1a1c890fe3bf9d9b9c0a74028e87857a7d
+R c0b23dfcab02e83590bbedcac610fa7b
+U drh
+Z 5a1528ca859870969ffba6e26496a443
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 34bc5bb12b579fb77c30861d7ee417c39e25b4a1..f56b36fa0bce699b2bc0ebea550f86d1d7544749 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e815055b321085deda8607ac3279ef1a1c890fe3bf9d9b9c0a74028e87857a7d
+76b6331e6a705a420a64820a18214f07cf4c1d5151e7158d6fff09964e63f352

diff --git a/src/shell.c.in b/src/shell.c.in
index 56f63fb190c9cf8eb3406603ec3571edf7ad3e6e..d1fc6aa748b9faf442bd673b838b68ac12bc3555 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -9913,7 +9913,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     int eMode = 0;
     int bOnce = 0;            /* 0: .output, 1: .once, 2: .excel/.www */
     int bPlain = 0;           /* --plain option */
-    static const char *zBomUtf8 = "\xef\xbb\xbf";
+    static const char *zBomUtf8 = "\357\273\277";
     const char *zBom = 0;
 
     failIfSafeMode(p, "cannot run .%s in safe mode", azArg[0]);