Do not use O_NOFOLLOW when opening a directory just to call fsync() on

that directory.

FossilOrigin-Name: 2fc80ef16ce5878311ab88a0c64631813572ffbb71f75363b4619c9667e0926b

diff --git a/manifest b/manifest
index 861b547a6b603902390c6ac5c0a20efb3fbcf42e..f57656af3ad5f02023d3431a8d7f7d02afc22084 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\s".filectrl"\scommand\sin\sthe\sCLI\sto\ssupport\sthe\s--schema\soption.
-D 2020-04-20T16:21:30.906
+C Do\snot\suse\sO_NOFOLLOW\swhen\sopening\sa\sdirectory\sjust\sto\scall\sfsync()\son\nthat\sdirectory.
+D 2020-04-20T17:35:32.334
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -516,7 +516,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 06593ba4bdfae42b30a897b3b4e59abb88a11d50dd0cad39003da955d822b8d1
+F src/os_unix.c 7ef8b60222558a373d89c18d0c3bc44365b45273a528183d40bec5bb76ce23fc
 F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c a71ffd145f55e28cbdc1bdabb5e6bef063da428a6c0de3c3a36e9a0c41d4c8c0
@@ -1861,7 +1861,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 abc1aad74f7b6a1e72fb09936239f2224aa942d16296c6a3de0b8daef4bc8471
-R 0b689458032aceec4d998f84188e0ee8
+P 698d40db58b76f4094687d46b5c6292702a62168054f9e6a70ee86650a6635f7
+R 1a3f713395bcb50f232d9e1e989d47d0
 U drh
-Z af548dcf210abacdeac04040d9882947
+Z 3de631e900a36e1c44f2a5a4e6c38aa5

diff --git a/manifest.uuid b/manifest.uuid
index c04fa12c7ab5f2c5e41aa0edc6dfb72b1d7e4935..567a9e7beb4fe36a1545062d2edc179523ccd3ac 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-698d40db58b76f4094687d46b5c6292702a62168054f9e6a70ee86650a6635f7
\ No newline at end of file
+2fc80ef16ce5878311ab88a0c64631813572ffbb71f75363b4619c9667e0926b
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index a4dd2f906c3db62feef30d44f04b4b7185204ac7..56e53929ea012f5c14aafb14d941e84c8373e66d 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3685,7 +3685,7 @@ static int openDirectory(const char *zFilename, int *pFd){
     if( zDirname[0]!='/' ) zDirname[0] = '.';
     zDirname[1] = 0;
   }
-  fd = robust_open(zDirname, O_RDONLY|O_BINARY|O_NOFOLLOW, 0);
+  fd = robust_open(zDirname, O_RDONLY|O_BINARY, 0);
   if( fd>=0 ){
     OSTRACE(("OPENDIR %-3d %s\n", fd, zDirname));
   }