Use osReadlink() in os_unix.c, not readlink() directly.

FossilOrigin-Name: c3da4c1611cebd9f9d695892a3ffddc47d5f0db1a1ea8bd2b4f83ef7673b68de

diff --git a/manifest b/manifest
index 506b6ed4cc1d8899ebba0387571fc97e16997343..3d59d54c1f4bf0794e4858443f121339b0223431 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sthe\sunix\sVFS,\srewrite\sthe\sxFullPathname\smethod\sso\sthat\sit\sautomatically\nresolves\sall\ssymbolic\slinks,\srendering\sa\scanonical\spathname\sthat\scontains\nno\ssymlinks.
-D 2022-05-11T16:46:27.636
+C Use\sosReadlink()\sin\sos_unix.c,\snot\sreadlink()\sdirectly.
+D 2022-05-11T17:45:50.754
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -537,7 +537,7 @@ F src/os.c b1c4f2d485961e9a5b6b648c36687d25047c252222e9660b7cc25a6e1ea436ab
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c 33fe706af9423563d4c7d4148e9f8bc1fb4b3669c4e32e66b5f1b963c6225f61
+F src/os_unix.c 02becb87c58245d2831f10f4f1a9108a465f8091cc598b2a9c78976f51a4e446
 F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 42120492784fc9bcd9082b5c9b5e329b7318c357f9f3574a1bbfcf7418910356
@@ -1953,11 +1953,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 764b71267e0b31ff7eaf2a0def7526a1a02dce4d5b456dea060d97ed342efdd1
-R 569af1c5eabca94740251c005b203dc3
-T *branch * resolve-symlinks
-T *sym-resolve-symlinks *
-T -sym-trunk *
+P 40c9273d0e0e74e1df22e996a5d486e838f4320defd2121e2d95eeed8aea6235
+R 114ae783653c7381e516a0c261b8b619
 U drh
-Z ce762f1e70449d535056ec1fff3f1e36
+Z 2491ed383edd9ee3426ed6172f3e61ac
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index bc8e305b6ba1c72bf3d895ecb58f6d0d80c4ba74..53003c0ad128a4066ea4e2440cb6ef54194e5e2e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-40c9273d0e0e74e1df22e996a5d486e838f4320defd2121e2d95eeed8aea6235
\ No newline at end of file
+c3da4c1611cebd9f9d695892a3ffddc47d5f0db1a1ea8bd2b4f83ef7673b68de
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index b9beb53aad12ce6238c5b079f917882dc8f2bf34..da50f2de1e229d9e6142c32759e72192a2e5b0cf 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6483,7 +6483,7 @@ static void appendOnePathElement(
         pPath->rc = SQLITE_CANTOPEN_BKPT;
         return;
       }
-      got = readlink(zIn, zLnk, sizeof(zLnk)-2);
+      got = osReadlink(zIn, zLnk, sizeof(zLnk)-2);
       if( got<=0 || got>=sizeof(zLnk)-2 ){
         pPath->rc = unixLogError(SQLITE_CANTOPEN_BKPT, "readlink", zIn);
         return;