Omit O_NOFOLLOW from the open() call when opening /dev/null, since /dev/null

is a symlink on Solaris, we are told.

FossilOrigin-Name: 0c683c43a62fe25c6cb765e4a31556ec91a7c21af79349b3d7eeb13f73dd1cdc

diff --git a/manifest b/manifest
index 2b5c8f8599d6d537fbca14fca0f0dbe6de3c3a1f..2fc5d5ded9eba239b471ff3a6589774fe0ba2f63 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sassert()\sstatement\sthat\swas\sadded\syesterday.\nTickets\s[41c1456a6e61c0e7]\sand\s[fb8c538a8f57ae2a].
-D 2020-02-13T11:46:47.621
+C Omit\sO_NOFOLLOW\sfrom\sthe\sopen()\scall\swhen\sopening\s/dev/null,\ssince\s/dev/null\nis\sa\ssymlink\son\sSolaris,\swe\sare\stold.
+D 2020-02-13T13:45:04.135
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -515,7 +515,7 @@ F src/os.c 669cc3839cc35d20f81faf0be1ab6d4581cea35e9d8f3a9d48a98d6571f7c285
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c ad7640c04eed946052a3b12856362a773d0a717696707313037186df0e2b59f2
+F src/os_unix.c 238ad16109b4160d0fba2597ef71459995ab5e304b3d8bbe290a8d5d6d6000e0
 F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b1e79698f3903e64d7a8ab5f4b3163aa39ed25686289a68de20b6b5734de70e6
@@ -1858,7 +1858,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2def75693a8ae002375aff80db0e6c970c75f75e8b6ba64f2c518712badb0ae8
-R 5b1afbb781378f6b65a725d2b15b77ab
+P abfb043ebb0c55fdc2be58255bc852b13865d81fa4c2e0dbe8c375810557aafe
+R d4cdcde20a4733b9029c60768cc19b63
 U drh
-Z 8b3282fc49a988e2f90c863fe4275699
+Z 24a71b5d93c7dee64e38be46600d1093

diff --git a/manifest.uuid b/manifest.uuid
index 6933b22c16589a21c3396df20c129bd9644a40ff..fbe55af4f86f70d7e7dfffe4bc85cfeae6736c95 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-abfb043ebb0c55fdc2be58255bc852b13865d81fa4c2e0dbe8c375810557aafe
\ No newline at end of file
+0c683c43a62fe25c6cb765e4a31556ec91a7c21af79349b3d7eeb13f73dd1cdc
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 07ae4bc03a4446e678fc28cf32c0d7581e2af562..cf1c579fd0907d1aab67e9ff1fcf3804903a356f 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -689,7 +689,7 @@ static int robust_open(const char *z, int f, mode_t m){
     sqlite3_log(SQLITE_WARNING, 
                 "attempt to open \"%s\" as file descriptor %d", z, fd);
     fd = -1;
-    if( osOpen("/dev/null", f, m)<0 ) break;
+    if( osOpen("/dev/null", O_RDONLY, m)<0 ) break;
   }
   if( fd>=0 ){
     if( m!=0 ){