From: drh <> Date: Fri, 13 Sep 2024 16:15:07 +0000 (+0000) Subject: Fix the hanging problem. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsqlite3-rsync-consio;p=thirdparty%2Fsqlite.git Fix the hanging problem. FossilOrigin-Name: d57903f7fdb5abbda70f049bb0b4e229deefc39b8a4a4c48203d4c4e7be3782c --- diff --git a/manifest b/manifest index 019fc96530..2d177f2ed6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Changes\sso\sthat\sthe\s-consio\ssub-branch\sof\ssqlite3-rsync\swill\scompile\son\nWin11.\s\sIt\scompiles,\sbut\sit\sdoes\snot\swork.\s\sThe\sprocess\sjust\shangs. -D 2024-09-13T16:08:11.097 +C Fix\sthe\shanging\sproblem. +D 2024-09-13T16:15:07.770 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -2174,7 +2174,7 @@ F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60 F tool/sqldiff.c 847fc8fcfddf5ce4797b7394cad6372f2f5dc17d8186e2ef8fb44d50fae4f44a -F tool/sqlite3-rsync.c 84fb2af8ae400c1182d3c38f9983b917960a89c5880ba25aeb4ee357cf39fe8e +F tool/sqlite3-rsync.c 780f48e6de46308546e1e4382f36ce85a4ab2085b75daa9c660e6d74fb1ea14c F tool/sqlite3_analyzer.c.in 8da2b08f56eeac331a715036cf707cc20f879f231362be0c22efd682e2b89b4f F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848 @@ -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 c9bdbe21feb924bde033e44b6d3c6c5fd81842d440dbd79c0a55a5650b7397e1 -R 3e381bedaf77448794c83d70241e540f +P b4eff1fd6eb5f373f0b4ca2709fcab735aed426cdfd8a88ed3f08fd10afcd534 +R cd42a019762d0f5cd5c8b6435be44826 U drh -Z ef41394227f5cb24eef353e12a70a4fe +Z ce55e767fb46264cb3e1a3b4cf6e579f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5c31d293fb..7f44cbcc04 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b4eff1fd6eb5f373f0b4ca2709fcab735aed426cdfd8a88ed3f08fd10afcd534 +d57903f7fdb5abbda70f049bb0b4e229deefc39b8a4a4c48203d4c4e7be3782c diff --git a/tool/sqlite3-rsync.c b/tool/sqlite3-rsync.c index d189f705a6..859cd74cec 100644 --- a/tool/sqlite3-rsync.c +++ b/tool/sqlite3-rsync.c @@ -109,7 +109,7 @@ struct SQLiteRsync { # define eputz(z) ePutsUtf8(z) # define eputf ePrintfUtf8 # define oputb(buf,na) oPutbUtf8(buf,na) -# define fflush(s) fFlushBuffer(s) +/*# define fflush(s) fFlushBuffer(s)*/ /**************************************************************************** ** Beginning of the popen2() implementation copied from Fossil *************