From: larrybr Date: Fri, 24 Nov 2023 13:30:49 +0000 (+0000) Subject: CLI .output/.once to not redirect ".timer on" results. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c44950df00a6941cfc043cc1f4615766ad837256;p=thirdparty%2Fsqlite.git CLI .output/.once to not redirect ".timer on" results. FossilOrigin-Name: 626c4353f2257f47dbad0e5cac4963f5d9ee91408382352374a712a42979fc78 --- diff --git a/manifest b/manifest index 7628c7d10a..f25c883228 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\soutput\sredirect\sbug\sreported\sin\s[forum:/forumposts/cbf4933cfeee74bb|the\sforum]. -D 2023-11-23T07:10:52.091 +C CLI\s.output/.once\sto\snot\sredirect\s".timer\son"\sresults. +D 2023-11-24T13:30:49.564 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -729,7 +729,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 85857bedd2913d888aa571755b48c54cd2e6e7fcb0087e19b226ee0368cfda1e -F src/shell.c.in 345be14456aeadfaaeced4149563a4a6d70942d8a38a1cd27b75d4e491757028 +F src/shell.c.in a492f9209fe62ce3d1048802d59cd6e38e8444f88573fe1aebaadcd22e04156b F src/sqlite.h.in d93a4821d2f792467a60f7dc81268d1bb8634f40c31694ef254cab4f9921f96a F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2143,9 +2143,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 24774e77c78705de9e10b9091b9d140cc7581de476b3d3e8febaff08c804a9c4 -Q +2ab256bc0bb351c16feaf0d4917ad9c3f55e39821cc7d319d86c6f0752188af7 -R 0ac33768dcfe1ff449f9d962bcd90506 +P 60bdd5c3d922fdd25204e5f6bae33b08c25042cec3539dd7c36234a96be92338 +Q +ce766ed51f772a960d0b7a52c113b55c7ae90ef35050496d8e2a77547eab1a4d +R 40bf3150165c6e30af576f63eaf694bf U larrybr -Z 1273695881b81a8d75e472cb0ae9d285 +Z cdf424ffa2e16b868946062c1d459846 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b72350866c..ea2c9a9e35 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -60bdd5c3d922fdd25204e5f6bae33b08c25042cec3539dd7c36234a96be92338 \ No newline at end of file +626c4353f2257f47dbad0e5cac4963f5d9ee91408382352374a712a42979fc78 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 6242074127..0ffd2b8d78 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -360,7 +360,7 @@ static void endTimer(void){ sqlite3_int64 iEnd = timeOfDay(); struct rusage sEnd; getrusage(RUSAGE_SELF, &sEnd); - oputf("Run Time: real %.3f user %f sys %f\n", + sputf(stdout, "Run Time: real %.3f user %f sys %f\n", (iEnd - iBegin)*0.001, timeDiff(&sBegin.ru_utime, &sEnd.ru_utime), timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));