From 4ee8e9681c0f429acb4b696890dd94b3fa754029 Mon Sep 17 00:00:00 2001 From: larrybr Date: Sat, 25 Feb 2023 15:15:40 +0000 Subject: [PATCH] Revert (mostly) to earlier CLI response to -echo and SQL at the command line. FossilOrigin-Name: 1c6cfcf6ed5e084e5eb6874a261f3670ab5fb3e5dbcf150f37c58b2f16351ee3 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/shell.c.in | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 47f38803ce..b61275760d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Performance\soptimization\son\ssqlite3_vsnprintf(). -D 2023-02-25T12:50:54.857 +C Revert\s(mostly)\sto\searlier\sCLI\sresponse\sto\s-echo\sand\sSQL\sat\sthe\scommand\sline. +D 2023-02-25T15:15:40.203 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -622,7 +622,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c a6a5cc0bbb97be616a2608cb5d063b6635b920ecd6b7b3445cde88597daf3542 -F src/shell.c.in d362b6faacd8f80d69cfcc7905b51912ecde4c7dcfbc32401d5af43768ce0d5e +F src/shell.c.in cb763c332be668ecba48c85de52df52a86f992867b813460d55c3bccaaf4c0eb F src/sqlite.h.in 5f308635ad467b50af858f271e403d14f8bcc574c2610f7cfd2d00f5bb37f616 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4 @@ -2046,8 +2046,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 6bba9100ae81466eeb49845c449cbfddf4f82f18b89f55e6ef575cbf66af63af -R 50518feb0ca5bebb9a44abf5ec071312 -U drh -Z 75921f7ab1a31bc1aea299fbe5176436 +P 4430e6e96dbf3d0b464776c132838dd3e456716e0ae5972fc7e0ece13b56ea25 +R 8941207ab3042353d14f49547d95d3a0 +U larrybr +Z 0509b1c3c7307441d1eefcb8a2685f24 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index af12ce8b5d..edb26eb4d4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4430e6e96dbf3d0b464776c132838dd3e456716e0ae5972fc7e0ece13b56ea25 \ No newline at end of file +1c6cfcf6ed5e084e5eb6874a261f3670ab5fb3e5dbcf150f37c58b2f16351ee3 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index bc3994dd17..5c8d47e9a0 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -12318,6 +12318,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ } }else{ open_db(&data, 0); + echo_group_input(&data, azCmd[i]); rc = shell_exec(&data, azCmd[i], &zErrMsg); if( zErrMsg || rc ){ if( zErrMsg!=0 ){ -- 2.47.2