Similar to what 8c4aa0ef998191ed828a37190dc179b91649938a did for ar and
strip, replace the non-standard futimes with the POSIX futimens.
Signed-off-by: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
---
debuginfod/debuginfod-client.c | 6 +++---
debuginfod/debuginfod.cxx | 13 ++++++-------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index b33408eb..460afd5c 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -1721,10 +1721,10 @@ debuginfod_query_server (debuginfod_client *c,
if (curl_res != CURLE_OK)
mtime = time(NULL); /* fall back to current time */
- struct timeval tvs[2];
+ struct timespec tvs[2];
tvs[0].tv_sec = tvs[1].tv_sec = mtime;
- tvs[0].tv_usec = tvs[1].tv_usec = 0;
- (void) futimes (fd, tvs); /* best effort */
+ tvs[0].tv_nsec = tvs[1].tv_nsec = 0;
+ (void) futimens (fd, tvs); /* best effort */
/* PR27571: make cache files casually unwriteable; dirs are already 0700 */
(void) fchmod(fd, 0400);
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 99b1f2b9..b39c0591 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -1635,13 +1635,12 @@ extract_section (int elf_fd, int64_t parent_mtime,
throw libc_exception (errno, "cannot write to temporary file");
/* Set mtime to be the same as the parent file's mtime. */
- struct timeval tvs[2];
+ struct timespec tvs[2];
if (fstat (elf_fd, &fs) != 0)
throw libc_exception (errno, "cannot fstat file");
- tvs[0].tv_sec = tvs[1].tv_sec = fs.st_mtime;
- tvs[0].tv_usec = tvs[1].tv_usec = 0;
- (void) futimes (fd, tvs);
+ tvs[0] = tvs[1] = fs.st_mtim;
+ (void) futimens (fd, tvs);
/* Add to fdcache. */
fdcache.intern (b_source, section, tmppath, data->d_size, true);
@@ -1951,10 +1950,10 @@ handle_buildid_r_match (bool internal_req_p,
// Set the mtime so the fdcache file mtimes, even prefetched ones,
// propagate to future webapi clients.
- struct timeval tvs[2];
+ struct timespec tvs[2];
tvs[0].tv_sec = tvs[1].tv_sec = archive_entry_mtime(e);
- tvs[0].tv_usec = tvs[1].tv_usec = 0;
- (void) futimes (fd, tvs); /* best effort */
+ tvs[0].tv_nsec = tvs[1].tv_nsec = archive_entry_mtime_nsec(e);
+ (void) futimens (fd, tvs); /* best effort */
if (r != 0) // stage 3
{
--
2.40.0
