From: stephan <stephan@noemail.net>
Date: Fri, 27 Jan 2023 05:37:24 +0000 (+0000)
Subject: Merge trunk into wasi-patches branch.
X-Git-Tag: version-3.41.0~35^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87ce1ff7f72621cb8a8a99dc93141d253899eba0;p=thirdparty%2Fsqlite.git

Merge trunk into wasi-patches branch.

FossilOrigin-Name: 2ce89f5efcdb8b4c58eb2d30833a76d79ae0134c31d5ab8564be9e1cf5a1f4f0
---

87ce1ff7f72621cb8a8a99dc93141d253899eba0
diff --cc manifest
index bf4dec75d1,f9d1a9c1c5..7f9f23a967
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Cherrypick\s[fa784101775b7|emscripten\sticket\s#18609\sworkaround]\sinto\strunk.
 -D 2023-01-27T05:17:10.270
 +C Merge\strunk\sinto\swasi-patches\sbranch.
- D 2023-01-21T12:18:28.661
++D 2023-01-27T05:37:24.147
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -604,10 -604,10 +604,10 @@@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b
  F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
- F src/os_unix.c ca8e0cd2fb8ec774cfe6bb1f101e480f2a8f913716976d95c5556fee780c099e
 -F src/os_unix.c 9107314500e44908e8d2cdf1ed3333ca5fa17dcfdf9c6a079002b4df90d5f806
++F src/os_unix.c 2ab48df80d598e11fe216dcae5cdf28d2b4c7ab195a685bd4047b9e534c3aaf6
  F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c d3122cf67f327f1e2df12d06236a3473a8099542071e257067552f42917f172d
+ F src/pager.c fc6d3ec7017d7369ab5dc5421ad1763ff224551c9381866b6da69040db62e406
  F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
  F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
  F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
@@@ -621,8 -621,8 +621,8 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c 5a98a7bf277aa60584b6bb4c5dd6a9ef2b19537910612c34f596e2901e88596d
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c d389ccdb96855dbfaadc22d936889e1f0652ffca17e31a6b6522b45d99daa8ce
- F src/shell.c.in 5795ec29ce0169ba5d084ef55cb6064c6fdf7cd3ad175873f3abfd71a307fb3d
- F src/sqlite.h.in 67749bfeae75c78184248fb867f600a8795ad3b4ecacbfd8c9d53eadef51f7b3
 -F src/shell.c.in f7fd28e68269a58690c665e8a5e96ba242201267925fbd335f08695c79fc6db7
 -F src/sqlite.h.in d2a5fc1f6740bd02b571d33d2eb308fa7d1b0fac5b86f6f1fe8310cd49bca97d
++F src/shell.c.in afe1b3762f7f33752d9c51ebc92c9ba8de21c3470af9ae03e961b380d1521ecf
++F src/sqlite.h.in 2b41f4908dd16cecb3754fe3fa2287a27ee825fb75d508ff2d7546b14e5a6ae6
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
  F src/sqliteInt.h 43eeee1ea80543a0e40444bf53643ca259a2b1158ccfe859a6a6435b7358ecdd
@@@ -2043,8 -2044,9 +2044,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P adc0ede0a43241b85563408d0de8e640a75ec4f7bdfe5e48acc5cdd6b182b88c 5a316f9fd94b73fc54ef94a1dab2f13bdd16c4fb13d2620b7c907d104d5b4d7a
- R de6b861425c8d5878acd44fd86977c48
 -P bdfd72a083fadd724030c4c89adae71426e1ddd402c6bc5abf40801ecf3253cf
 -Q +fa784101775b795077a23c211b5b16f51ad5a13967c284511f310dfcbfa9f77a
 -R f546cb30f93859da1452256662a169a1
++P 6fc20d75d49310aedbc3351a4a5f1aa9ef5b4100501c7bfbe556aca2be2e44d7 9a26fae545b9c97129893b83ff97e62b1c477eccd1379af1dce4a3cc4fa9f932
++R 145aa0c23a71f0a1d2cc97d60c0a4a1e
  U stephan
- Z f0c9570019c6692ba71970c30a38e676
 -Z 2937fe2d7bb3aa79ea588267ef9524d2
++Z ecd9a24931c0cd6ff26d46c7f1fc2570
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 48c531cc76,ca24ae6feb..baa286d943
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6fc20d75d49310aedbc3351a4a5f1aa9ef5b4100501c7bfbe556aca2be2e44d7
 -9a26fae545b9c97129893b83ff97e62b1c477eccd1379af1dce4a3cc4fa9f932
++2ce89f5efcdb8b4c58eb2d30833a76d79ae0134c31d5ab8564be9e1cf5a1f4f0
diff --cc src/os_unix.c
index 78ce223d9e,c3359f1bc7..e430e5df35
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@@ -184,46 -183,9 +184,46 @@@
  */
  #define SQLITE_MAX_SYMLINKS 100
  
 +/*
 +** Remove and stub certain info for WASI (WebAssembly System
 +** Interface) builds.
 +*/
 +#ifdef SQLITE_WASI
 +# undef HAVE_FCHMOD
 +# undef HAVE_FCHOWN
 +# undef HAVE_MREMAP
 +# define HAVE_MREMAP 0
 +# ifndef SQLITE_DEFAULT_UNIX_VFS
 +#  define SQLITE_DEFAULT_UNIX_VFS "unix-dotfile"
 +   /* ^^^ should SQLITE_DEFAULT_UNIX_VFS be "unix-none"? */
 +# endif
 +# ifndef F_RDLCK
 +#  define F_RDLCK 0
 +#  define F_WRLCK 1
 +#  define F_UNLCK 2
 +#  if __LONG_MAX == 0x7fffffffL
 +#   define F_GETLK 12
 +#   define F_SETLK 13
 +#   define F_SETLKW 14
 +#  else
 +#   define F_GETLK 5
 +#   define F_SETLK 6
 +#   define F_SETLKW 7
 +#  endif
 +# endif
 +#else /* !SQLITE_WASI */
 +# ifndef HAVE_FCHMOD
 +#  define HAVE_FCHMOD
 +# endif
 +#endif /* SQLITE_WASI */
 +
 +#ifdef SQLITE_WASI
- # define osGetpid(X) 1
++# define osGetpid(X) (pid_t)1
 +#else
  /* Always cast the getpid() return type for compatibility with
  ** kernel modules in VxWorks. */
 -#define osGetpid(X) (pid_t)getpid()
 +# define osGetpid(X) (pid_t)getpid()
 +#endif
  
  /*
  ** Only set the lastErrno if the error code is a real error and not