From: drh <>
Date: Sat, 25 Oct 2025 18:40:18 +0000 (+0000)
Subject: Adjust unixPosixAdvisorLocks() to use redirectable system calls so that
X-Git-Tag: major-release~41^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7be565f0cc8c2bac7d096087f689356eacd26f00;p=thirdparty%2Fsqlite.git

Adjust unixPosixAdvisorLocks() to use redirectable system calls so that
it can be tested.

FossilOrigin-Name: eafe88b782875cd839fc27da509830e3e1d95781c686e27242a2844910203a42
---

diff --git a/manifest b/manifest
index cc2990a13c..2e6948ddc8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\sCLI\sdeduceDatabaseType\sfix\sfrom\strunk.
-D 2025-10-25T18:36:14.478
+C Adjust\sunixPosixAdvisorLocks()\sto\suse\sredirectable\ssystem\scalls\sso\sthat\nit\scan\sbe\stested.
+D 2025-10-25T18:40:18.437
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -720,7 +720,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
 F src/os_kv.c fb7ba8d6204197357f1eb7e1c7450d09c10043bf7e99aba602f4aa46b8fb11a3
 F src/os_setup.h 8efc64eda6a6c2f221387eefc2e7e45fd5a3d5c8337a7a83519ba4fbd2957ae2
-F src/os_unix.c 0c5a7f020a37edbfaacdc4e6327c70cbfbad831c8e41ee6c4cee0cab2d7feb02
+F src/os_unix.c 35ea3a2362b58390181bbb2450006558eb2fca72df31f6a933967ade4baa1172
 F src/os_win.c 5b14841f9c3ab76841c06a4eca20ba3e7747f44253eba9dfd3d918797e753d49
 F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
 F src/pager.c 113f9149092ccff6cf90e97c2611200e5a237f13d26c394bc9fd933377852764
@@ -2171,8 +2171,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 85846c7fbeeaf5fccfcbe11a4b87c4ee49781456ccb4da1d090b7823d7b456d6 2a3a02715fa53673531575fa13aee056711139b409367cccc18654e82720c4e6
-R 8fb566088024c49e26872b2438175877
+P 82f907016ee75ca288d8ac0664d5c147fbfad42c5f8222211acc3220bd0eb609
+R 72947327af2da3dba426a4fa276ec4a3
 U drh
-Z a5dc0125f157b62702255a4ec808a651
+Z a63b0b7b05ef1a6b7c4fe4c0a7d92948
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 367cd3bc88..bc53e498a7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-82f907016ee75ca288d8ac0664d5c147fbfad42c5f8222211acc3220bd0eb609
+eafe88b782875cd839fc27da509830e3e1d95781c686e27242a2844910203a42
diff --git a/src/os_unix.c b/src/os_unix.c
index 25c15e2c59..1d0db5fa0b 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -648,12 +648,12 @@ static int unixPosixAdvisoryLocks(
         /*   012 4 678 01234 */
   memcpy(a, "---/-.---.-----", 16);
   sqlite3_snprintf(sizeof(z), z, "/proc/%d/fdinfo/%d", getpid(), fd);
-  in = open(z, O_RDONLY);
+  in = osOpen(z, O_RDONLY, 0);
   if( in<0 ){
     return SQLITE_ERROR_UNABLE;
   }
-  n = read(in, z, sizeof(z)-1);
-  close(in);
+  n = osRead(in, z, sizeof(z)-1);
+  osClose(in);
   if( n<=0 ) return SQLITE_ERROR_UNABLE;
   z[n] = 0;