Call fflush() on ".echo" output from the shell, so that the output to

stdout is aligned with output to stderr.

FossilOrigin-Name: c38b9db3c4f71706a7d211424da64311e6e5daf64b224565a6d82d4b1a68e261

diff --git a/manifest b/manifest
index 9301466f3bb0aa5eb64e4a02341c00d4d840c0f3..61d0831e96b11737036be7fb6fedb0c4bf5e0456 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sargument\sexpansion\sin\ssqlite-tclsh\son\sWindows\ssuch\sthat\sif\san\sargument\ndoes\snot\smatch\sa\sfilename\seven\safter\sglob\sexpansion,\sit\sis\sappended\sto\sthe\nargument\slist\sverbatim.
-D 2024-11-16T17:39:34.746
+C Call\sfflush()\son\s".echo"\soutput\sfrom\sthe\sshell,\sso\sthat\sthe\soutput\sto\nstdout\sis\saligned\swith\soutput\sto\sstderr.
+D 2024-11-16T18:54:46.664
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -775,7 +775,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
-F src/shell.c.in c61d7af58e678d479f1450e4ea236d2d6ac3bb16a636030104f210303b30d563
+F src/shell.c.in 469039a2a09603bf32f47b5c4ddc61e8b980139919db1f46000241357f5f3588
 F src/sqlite.h.in 4d93768709c53b7c653a63817a82d5a8625264ca0d8cdf99967ba147bdcf2aa6
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d2e8c161a14fbbcc52c50dfd9274c9969e3c273e2cb7cbf2f865541af9f39ead
-R 3550a38f34f40ce6e4e244b9386d8410
+P cd942dce148c9d8f5a94cee61923aad8d1b732b807e004005f78323be30c02e7
+R c6e3e7808022fc93197afc8ff5529a17
 U drh
-Z 0ad8b78a6ff21acc6a3ebcf1785c2111
+Z 8206467963ac0d5803b490ec391283d6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0322597271dbe052e653ba704c26d86e4b0f2db2..db6cd4173cd6d27e417bf6a9160397cd0cfb25ed 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd942dce148c9d8f5a94cee61923aad8d1b732b807e004005f78323be30c02e7
+c38b9db3c4f71706a7d211424da64311e6e5daf64b224565a6d82d4b1a68e261

diff --git a/src/shell.c.in b/src/shell.c.in
index 55fba9d82d63d764a5bc4e7a67bc7e919cfd4cfd..26b6d73de6a5473663d9e7d84fb11f874ba198c1 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12237,7 +12237,10 @@ static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
 }
 
 static void echo_group_input(ShellState *p, const char *zDo){
-  if( ShellHasFlag(p, SHFLG_Echo) ) sqlite3_fprintf(p->out, "%s\n", zDo);
+  if( ShellHasFlag(p, SHFLG_Echo) ){
+    sqlite3_fprintf(p->out, "%s\n", zDo);
+    fflush(p->out);
+  }
 }
 
 #ifdef SQLITE_SHELL_FIDDLE