From cedc3eee7093e6f57fdcfbf7d41b11236155e74f Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 19 Nov 2022 15:03:25 +0000 Subject: [PATCH] Elide a wasi-incompatible shell.c block in SQLITE_WASI builds. FossilOrigin-Name: 9b8b15a779158ec7c39d936f6bfa6a35e12063a36933341ade051809993a5678 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index d1c0d7e692..08b8556459 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Default\sto\sSQLITE_THREADSAFE=0\sand\sSQLITE_OMIT_LOAD_EXTENSION\sfor\swasi\sbuilds. -D 2022-11-19T07:44:32.626 +C Elide\sa\swasi-incompatible\sshell.c\sblock\sin\sSQLITE_WASI\sbuilds. +D 2022-11-19T15:03:25.773 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -640,7 +640,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 -F src/shell.c.in f5b696b44319a7c820b1b2922ce8d34fdf330337beaa6e87c0fd85c5c92bcd34 +F src/shell.c.in c04980beb7d8a6443bef463d3bac695d35c76e26a577076f2390efc871193cea F src/sqlite.h.in 843bf14e3dff296f0b2be440e59094530063bc6052347e23e97e6667ad59acad F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f @@ -2057,8 +2057,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 80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 -R beeafe07073ef1e2ccb7ee0293a95ef3 +P 382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 +R fbc353ec2c303468e2c4f3839734e5b5 U stephan -Z 10684edd410c3d649eb3bf1e4a06ed31 +Z 832db4ba1df42c3e6c0af6e904f13656 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6b8332d051..9858321ac0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 \ No newline at end of file +9b8b15a779158ec7c39d936f6bfa6a35e12063a36933341ade051809993a5678 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 36999ed44a..e06d0ab09b 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -11196,7 +11196,7 @@ static char *find_home_dir(int clearFlag){ if( home_dir ) return home_dir; #if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \ - && !defined(__RTP__) && !defined(_WRS_KERNEL) + && !defined(__RTP__) && !defined(_WRS_KERNEL) && !defined(SQLITE_WASI) { struct passwd *pwent; uid_t uid = getuid(); -- 2.47.3