From: drh <drh@noemail.net>
Date: Fri, 12 Jan 2018 14:34:45 +0000 (+0000)
Subject: Always use utimes() instead of utimensat() since the latter is not available
X-Git-Tag: version-3.22.0~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ac7303e1ab5e0b224124e1c8f180cfa4d491e03;p=thirdparty%2Fsqlite.git

Always use utimes() instead of utimensat() since the latter is not available
even on some recent unix systems.

FossilOrigin-Name: 30ed7a4b6408f0ca921abc4d8b7bb5404fc7708cedcd104b017b361054e7148c
---

diff --git a/ext/misc/fileio.c b/ext/misc/fileio.c
index f126a2e435..7035889482 100644
--- a/ext/misc/fileio.c
+++ b/ext/misc/fileio.c
@@ -86,6 +86,7 @@ SQLITE_EXTENSION_INIT1
 #  include <unistd.h>
 #  include <dirent.h>
 #  include <utime.h>
+#  include <sys/time.h>
 #else
 #  include "windows.h"
 #  include <io.h>
@@ -285,7 +286,7 @@ static int writeFile(
     }else{
       return 1;
     }
-#elif defined(AT_FDCWD)
+#elif defined(AT_FDCWD) && 0 /* utimensat() is not univerally available */
     /* Recent unix */
     struct timespec times[2];
     times[0].tv_nsec = times[1].tv_nsec = 0;
diff --git a/manifest b/manifest
index 628128b51f..59bb960e32 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stest\sto\sensure\sthat\sthe\ssqlite3changeset_apply()\sfunction\signores\stables\nthat\sdo\snot\shave\sthe\sexpected\sprimary\skeys.
-D 2018-01-12T12:02:02.075
+C Always\suse\sutimes()\sinstead\sof\sutimensat()\ssince\sthe\slatter\sis\snot\savailable\neven\son\ssome\srecent\sunix\ssystems.
+D 2018-01-12T14:34:45.816
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -277,7 +277,7 @@ F ext/misc/compress.c dd4f8a6d0baccff3c694757db5b430f3bbd821d8686d1fc24df55cf9f0
 F ext/misc/csv.c 1a009b93650732e22334edc92459c4630b9fa703397cbb3c8ca279921a36ca11
 F ext/misc/dbdump.c 3509fa6b8932d04e932d6b6b827b6a82ca362781b8e8f3c77336f416793e215e
 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
-F ext/misc/fileio.c 1194228c96d6b7a374e93602e2ba1899b42d0fc4d4c5253962fb13e1c9ed1f77
+F ext/misc/fileio.c 777c13f00b4505df3bfab602568c98d2b067f7d1d265de88160d0f1ac92f3dcf
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
 F ext/misc/json1.c dbe086615b9546c156bf32b9378fc09383b58bd17513b866cfd24c1e15281984
@@ -1698,7 +1698,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 a5d09dfaa337fa51d6e702c6aefe58824ab1e7d221c6e79166e2c6f9c7ab1501
-R 180a0996d52ee7f7f835ebd96e9ccca1
-U dan
-Z 12f762acfd5b059fba2b906c66463308
+P bf2daf06279e46bc37cc92ad1becec1b12d2aa804a14b101fca8b3a7fdb280c3
+R 2f0bebc7abfba03f2a023e68e468fd71
+U drh
+Z 3cf98027077857228d4585915175b98d
diff --git a/manifest.uuid b/manifest.uuid
index 5e594f1a72..95795ed262 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bf2daf06279e46bc37cc92ad1becec1b12d2aa804a14b101fca8b3a7fdb280c3
\ No newline at end of file
+30ed7a4b6408f0ca921abc4d8b7bb5404fc7708cedcd104b017b361054e7148c
\ No newline at end of file