Commit Diff

Commit:
0823ffc2f6c509dbcedfb15d0d1011a253b45ef9
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
Message:
use modern POSIX timestamp fields in struct stat ok stsp
Actions:
Patch | Tree
commit - 53dfa00d415bb0c005a2b76db8398bc38583065f
commit + 0823ffc2f6c509dbcedfb15d0d1011a253b45ef9
blob - 1e59fdb908a5087e2dbdb5ce930a9743a9eead43
blob + 04443aa094268bbea1d505ec47ffe7bac202ab71
--- lib/fileindex.c
+++ lib/fileindex.c
@@ -105,10 +105,10 @@ got_fileindex_entry_update(struct got_fileindex_entry 
 
 	if ((ie->flags & GOT_FILEIDX_F_NO_FILE_ON_DISK) == 0) {
 		if (update_timestamps) {
-			ie->ctime_sec = sb.st_ctime;
-			ie->ctime_nsec = sb.st_ctimensec;
-			ie->mtime_sec = sb.st_mtime;
-			ie->mtime_nsec = sb.st_mtimensec;
+			ie->ctime_sec = sb.st_ctim.tv_sec;
+			ie->ctime_nsec = sb.st_ctim.tv_nsec;
+			ie->mtime_sec = sb.st_mtim.tv_sec;
+			ie->mtime_nsec = sb.st_mtim.tv_nsec;
 		}
 		ie->uid = sb.st_uid;
 		ie->gid = sb.st_gid;
blob - 8afc4c2596b52c558eca6fd9e0ac8678040d308f
blob + 3d078a53722abb4003341e563cdeca7f44e4dffe
--- lib/worktree.c
+++ lib/worktree.c
@@ -1569,10 +1569,10 @@ xbit_differs(struct got_fileindex_entry *ie, uint16_t 
 static int
 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
 {
-	return !(ie->ctime_sec == sb->st_ctime &&
-	    ie->ctime_nsec == sb->st_ctimensec &&
-	    ie->mtime_sec == sb->st_mtime &&
-	    ie->mtime_nsec == sb->st_mtimensec &&
+	return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
+	    ie->ctime_nsec == sb->st_ctim.tv_nsec &&
+	    ie->mtime_sec == sb->st_mtim.tv_sec &&
+	    ie->mtime_nsec == sb->st_mtim.tv_nsec &&
 	    ie->size == (sb->st_size & 0xffffffff) &&
 	    !xbit_differs(ie, sb->st_mode));
 }