From: larrybr <larrybr@noemail.net>
Date: Fri, 20 Sep 2024 13:13:11 +0000 (+0000)
Subject: Sync with trunk. Buildable. (A WIP, to be further tested)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad22e5e9454c05fa40326c746a710af5bdac0d2b;p=thirdparty%2Fsqlite.git

Sync with trunk. Buildable. (A WIP, to be further tested)

FossilOrigin-Name: 187f1d0a1c375db4bbf5bbdb29295578c891b9cb25e890e1f9bed364f2938055
---

ad22e5e9454c05fa40326c746a710af5bdac0d2b
diff --cc ext/consio/console_io.c
index 39afce0565,75324a34fd..8f9f36d00c
--- a/ext/consio/console_io.c
+++ b/ext/consio/console_io.c
@@@ -722,15 -705,15 +722,14 @@@ SQLITE_INTERNAL_LINKAGE char* fGetsUtf8
  # if CIO_WIN_WC_XLATE
    if( pfIn == consoleInfo.pstSetup[0].pf
        && (consoleInfo.sacSetup & SAC_InConsole)!=0 ){
--#  if CIO_WIN_WC_XLATE==1
--#   define SHELL_GULP 150 /* Count of WCHARS to be gulped at a time */
++#  define SHELL_GULP 150 /* Count of WCHARS to be gulped at a time */
      WCHAR wcBuf[SHELL_GULP+1];
      int lend = 0, noc = 0;
      if( ncMax > 0 ) cBuf[0] = 0;
      while( noc < ncMax-8-1 && !lend ){
        /* There is room for at least 2 more characters and a 0-terminator. */
        int na = (ncMax > SHELL_GULP*4+1 + noc)? SHELL_GULP : (ncMax-1 - noc)/4;
--#   undef SHELL_GULP
++#  undef SHELL_GULP
        DWORD nbr = 0;
        BOOL bRC = ReadConsoleW(consoleInfo.pstSetup[0].hx, wcBuf, na, &nbr, 0);
        if( bRC && nbr>0 && (wcBuf[nbr-1]&0xF800)==0xD800 ){
@@@ -773,12 -756,12 +772,11 @@@
        cBuf[noc] = 0;
        return cBuf;
      }else return 0;
--#  endif
    }else{
--# endif
      return cfGets(cBuf, ncMax, pfIn);
--# if CIO_WIN_WC_XLATE
    }
++# else
++  return fgets(cBuf, ncMax, pfIn);
  # endif
  }
  #endif /* !defined(SQLITE_CIO_NO_TRANSLATE) */
diff --cc manifest
index c21e86ae9e,1d1595b32b..aa96d214a8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Move\snon-console\sFILE*\sI/O\sto\s{Read,Write}File()\son\sWin32.\s(This\sis\sa\sWIP.\sIt\sbuilds\sbut\sneeds\smore\stesting.)
- D 2024-09-20T02:08:33.299
 -C Fix\sharmless\scompiler\swarning\sin\sthe\svfstrace\sextension.
 -D 2024-09-19T15:44:41.059
++C Sync\swith\strunk.\sBuildable.\s(A\sWIP,\sto\sbe\sfurther\stested)
++D 2024-09-20T13:13:11.414
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -53,8 -53,8 +53,8 @@@ F ext/README.md fd5f78013b0a2bc6f0067af
  F ext/async/README.txt e12275968f6fde133a80e04387d0e839b0c51f91
  F ext/async/sqlite3async.c 6f247666b495c477628dd19364d279c78ea48cd90c72d9f9b98ad1aff3294f94
  F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a49808287f04aa5309a
- F ext/consio/console_io.c 64e33ce4e2ae389e0b424b52aa5536542d4ef1bf8fc3096c02fcdb88252d7ac1 x
 -F ext/consio/console_io.c d2b74afae8d301de2e8447b1045fcd33eb59df13bf581d906d99c74fe5d2b13f x
 -F ext/consio/console_io.h b5ebe34aa15b357621ebbea3d3f2e2b24750d4280b5802516409e23947fd9ee5
++F ext/consio/console_io.c 0bfb970e55fa080fbba5fc7b6fb2cd03029664e5bcce8dae4c60c2823871c0a4 x
 +F ext/consio/console_io.h 6212909529c4ab3deeeee29db2d0b2b9cd5c881cc9dd51dede079273ce91db3d
  F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
  F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
  F ext/expert/expert1.test 661f873fd451127edf822ef0d520088faa319135f6a15bd10be6801ac284ac9b
@@@ -433,6 -435,7 +435,7 @@@ F ext/misc/urifuncs.c f71360d14fa9e7626
  F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
  F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
  F ext/misc/vfsstat.c a85df08654743922a19410d7b1e3111de41bb7cd07d20dd16eda4e2b808d269d
 -F ext/misc/vfstrace.c ac76a4ac4d907774fd423cc2b61410c756f9d0782e27cf6032e058594accaaca
++F ext/misc/vfstrace.c ac76a4ac4d907774fd423cc2b61410c756f9d0782e27cf6032e058594accaaca w src/test_vfstrace.c
  F ext/misc/vtablog.c 1100250ce8782db37c833e3a9a5c9a3ecf1af5e15b8325572b82e6e0a138ffb5
  F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
  F ext/misc/wholenumber.c 0fa0c082676b7868bf2fa918e911133f2b349bcdceabd1198bba5f65b4fc0668
@@@ -2210,8 -2213,8 +2213,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 2d783524d1671d988ebb1b21c83de99c9f335963b6c20cf4df612f58c13da913
- R 87ebc55b97e725c152c1936c6291b015
 -P 7b3a517b3e16ea487ca77a2c88a0c11d737de366524fc911aa1bdd6bfb7ad148
 -R 8abdc1cdf80137783779f70c3d138da6
 -U drh
 -Z c819f659938ee23a1835b141078e9e36
++P b769ed002794405f1967206b8b8aab4e449d297b0c34fc2d70e1dcc71d4c91b1 c8b4d092a22d87f1231424c8e3fa6a02f17fb965cb2a931621e1b51f4d215de7
++R 9a524876eb18ca8463a3009c2ddb5ed1
 +U larrybr
- Z de6ab6cd993a2843b724bb0751411acd
++Z 96ca3eaf86ad31e91c567dfd0a49b250
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 7bd1171e43,c3cee852f2..2e79e2468b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b769ed002794405f1967206b8b8aab4e449d297b0c34fc2d70e1dcc71d4c91b1
 -c8b4d092a22d87f1231424c8e3fa6a02f17fb965cb2a931621e1b51f4d215de7
++187f1d0a1c375db4bbf5bbdb29295578c891b9cb25e890e1f9bed364f2938055