When showHeader set at CLI invocation, do not auto-set it later.

FossilOrigin-Name: 733b7d4f95a4e2f0df323974f323c40c2486b188d442e74306a4b580fd8a8bd8

diff --git a/manifest b/manifest
index 0623eca37bd8e50f5f4dc27ea10abc1019f15828..4fb709ccf3a18b430cafa6101db54017863791c7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Back\sout\schanges\s[00286ca5d998d802]\sand\s[6844ede29e1dac93]\s(replacing\sthe\nassociated\sbranches\swith\sNEVER())\sand\sadd\sa\ssingle\snew\stest\sto\nbtreeOverwriteCell()\sthat\sdetects\swhen\san\soverflow\spages\sis\salso\smapped\ninto\sa\sb-tree\spage\sand\sraises\sand\simmediate\sSQLITE_CORRUPT\serror\sbefore\nmaking\sany\schanges.\ndbsqlfuzz\s81791bd980fe6935ff2c7334ec8bef11c1c12b82\sand\sothers.
-D 2021-09-10T01:02:42.266
+C When\sshowHeader\sset\sat\sCLI\sinvocation,\sdo\snot\sauto-set\sit\slater.
+D 2021-09-10T01:45:20.943
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -545,7 +545,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c b2c48dfc02b486fd2da2be1605503615958ba1997d40d994c2946975d0150a31
-F src/shell.c.in af6c3a4942c17a5e28cd47cc111d2f6d6946388c1ff0f5a402208e3f28b666bf
+F src/shell.c.in 2c063d07127aa59e45806ae7911fa6963664901f9fdccfba71b926195d34be36
 F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
@@ -1922,7 +1922,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6844ede29e1dac93a392dfb1e7e676bb9d0a2e7bbec0a4a5804ffc2025a99b66
-R c7edda4bf8c5cd37a2071fe54c9ca0b9
-U drh
-Z 09e56d520fbccbfbbf9b532c35be723e
+P 32210fa4ac4f06e1705ef808731c7be040a23f9a8630986440100c5d4e76dc07
+R f6c26ef1bf4f79ec99d050527daa9305
+U larrybr
+Z d665dd22a5a71bf376be8412530b7279

diff --git a/manifest.uuid b/manifest.uuid
index c3b2d962a4a073f7515f22daf9eabf9d1f74c039..743b8dfa77d3a2261591fbf4fe62ae159c3d0c43 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32210fa4ac4f06e1705ef808731c7be040a23f9a8630986440100c5d4e76dc07
\ No newline at end of file
+733b7d4f95a4e2f0df323974f323c40c2486b188d442e74306a4b580fd8a8bd8
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 438119c08f6266a9034e9230fe3d49e944d61cf1..bf3bf97ed055afd7a477d1d1b7a07421f72b7af9 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1203,7 +1203,7 @@ struct ShellState {
 #define SHFLG_Newlines       0x00000010 /* .dump --newline flag */
 #define SHFLG_CountChanges   0x00000020 /* .changes setting */
 #define SHFLG_Echo           0x00000040 /* .echo or --echo setting */
-#define SHFLG_HeaderSet      0x00000080 /* .header has been used */
+#define SHFLG_HeaderSet      0x00000080 /* showHeader has been specified */
 #define SHFLG_DumpDataOnly   0x00000100 /* .dump show data only */
 #define SHFLG_DumpNoSys      0x00000200 /* .dump omits system tables */
 
@@ -11448,8 +11448,10 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
                        "%s",cmdline_option_value(argc,argv,++i));
     }else if( strcmp(z,"-header")==0 ){
       data.showHeader = 1;
-    }else if( strcmp(z,"-noheader")==0 ){
+      ShellSetFlag(&data, SHFLG_HeaderSet);
+     }else if( strcmp(z,"-noheader")==0 ){
       data.showHeader = 0;
+      ShellSetFlag(&data, SHFLG_HeaderSet);
     }else if( strcmp(z,"-echo")==0 ){
       ShellSetFlag(&data, SHFLG_Echo);
     }else if( strcmp(z,"-eqp")==0 ){