Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Use futimesat to even more simplify
Baptiste Daroussin committed 9 years ago
commit ea95e2279aaedc7a055a05d831335a4b1685be07
parent e03b0fe
1 file changed +1 -4
modified libpkg/pkg_add.c
@@ -219,20 +219,17 @@ set_attrs(int fd, char *path, mode_t perm, uid_t uid, gid_t gid,
	}
#else
	struct timeval tv[2];
-
	int ffd;

	tv[0].tv_sec = ats->tv_sec;
	tv[0].tv_usec = ats->tv_nsec / 1000;
	tv[1].tv_sec = mts->tv_sec;
	tv[1].tv_usec = mts->tv_nsec / 1000;

-
	ffd = openat(fd, RELATIVE_PATH(path), O_RDWR|O_NOFOLLOW);
-
	if (ffd == -1 || futimes(ffd, tv) == -1) {
+
	if (futimesat(fd, RELATIVE_PATH(path), tv) == -1) {
		pkg_emit_error("Fail to set time on %s: %s", path,
		    strerror(errno));
		return (EPKG_FATAL);
	}
-
	close(ffd);
#endif

	if (getenv("INSTALL_AS_USER") == NULL) {