From 30fbd496a1793b4374873144432f9b7a996a689d Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 24 Jul 2019 12:35:35 +0200 Subject: cleanup: remove atime/ctime processing code This commit removes all the code for parsing and processing atime/ctime and values and related test code. Caring about those is kind of pointless because squashfs can only store mtime in inodes. The only relevant place is when generating a struct stat from a squashfs inode or an fstree node. Signed-off-by: David Oberhollenzer --- tests/fstree_init.c | 4 ---- tests/tar_gnu.c | 14 -------------- tests/tar_pax.c | 12 ------------ tests/tar_ustar.c | 14 -------------- tests/tar_xattr_bsd.c | 2 -- tests/tar_xattr_schily.c | 2 -- 6 files changed, 48 deletions(-) (limited to 'tests') diff --git a/tests/fstree_init.c b/tests/fstree_init.c index 79033e0..a9428e4 100644 --- a/tests/fstree_init.c +++ b/tests/fstree_init.c @@ -18,8 +18,6 @@ int main(void) assert(fstree_init(&fs, 512, str) == 0); free(str); assert(fs.defaults.st_mtime == 1337); - assert(fs.defaults.st_atime == 1337); - assert(fs.defaults.st_ctime == 1337); assert(fs.defaults.st_uid == 1000); assert(fs.defaults.st_gid == 100); assert(fs.defaults.st_mode == (S_IFDIR | 0321)); @@ -27,8 +25,6 @@ int main(void) assert(fstree_init(&fs, 512, NULL) == 0); assert(fs.defaults.st_mtime == 0); - assert(fs.defaults.st_atime == 0); - assert(fs.defaults.st_ctime == 0); assert(fs.defaults.st_uid == 0); assert(fs.defaults.st_gid == 0); assert(fs.defaults.st_mode == (S_IFDIR | 0755)); diff --git a/tests/tar_gnu.c b/tests/tar_gnu.c index 3f57cee..c5f8ddb 100644 --- a/tests/tar_gnu.c +++ b/tests/tar_gnu.c @@ -48,8 +48,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542905892); - assert(hdr.sb.st_atime == 1542905892); - assert(hdr.sb.st_ctime == 1542905892); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data0", fd, buffer, 5) == 0); @@ -65,8 +63,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 013375560044); - assert(hdr.sb.st_atime == 013375561762); - assert(hdr.sb.st_ctime == 013375561750); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data1", fd, buffer, 5) == 0); @@ -82,8 +78,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 8589934592); assert(hdr.sb.st_mtime == 013375730126); - assert(hdr.sb.st_atime == 013375730126); - assert(hdr.sb.st_ctime == 013375730126); assert(strcmp(hdr.name, "big-file.bin") == 0); assert(!hdr.unknown_record); clear_header(&hdr); @@ -96,8 +90,6 @@ int main(void) assert(hdr.sb.st_gid == 0x80000000); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 013376036700); - assert(hdr.sb.st_atime == 013376036700); - assert(hdr.sb.st_ctime == 013376036700); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data2", fd, buffer, 5) == 0); @@ -113,8 +105,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 8589934592); - assert(hdr.sb.st_atime == 8589934592); - assert(hdr.sb.st_ctime == 8589934592); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data3", fd, buffer, 5) == 0); @@ -130,8 +120,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == -315622800); - assert(hdr.sb.st_atime == -315622800); - assert(hdr.sb.st_ctime == -315622800); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data4", fd, buffer, 5) == 0); @@ -147,8 +135,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542909670); - assert(hdr.sb.st_atime == 1542909670); - assert(hdr.sb.st_ctime == 1542909670); assert(strcmp(hdr.name, filename) == 0); assert(!hdr.unknown_record); assert(read_data("data5", fd, buffer, 5) == 0); diff --git a/tests/tar_pax.c b/tests/tar_pax.c index f0f664b..c383427 100644 --- a/tests/tar_pax.c +++ b/tests/tar_pax.c @@ -48,8 +48,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542905892); - assert(hdr.sb.st_atime == 1542905911); - assert(hdr.sb.st_ctime == 1542905892); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data0", fd, buffer, 5) == 0); @@ -65,8 +63,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 8589934592); assert(hdr.sb.st_mtime == 1542959190); - assert(hdr.sb.st_atime == 1542959522); - assert(hdr.sb.st_ctime == 1542959190); assert(strcmp(hdr.name, "big-file.bin") == 0); assert(!hdr.unknown_record); clear_header(&hdr); @@ -79,8 +75,6 @@ int main(void) assert(hdr.sb.st_gid == 2147483648); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 013376036700); - assert(hdr.sb.st_atime == 1542999264); - assert(hdr.sb.st_ctime == 1542999260); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data1", fd, buffer, 5) == 0); @@ -96,8 +90,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 8589934592); - assert(hdr.sb.st_atime == 1543015522); - assert(hdr.sb.st_ctime == 1543015033); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data2", fd, buffer, 5) == 0); @@ -113,8 +105,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == -315622800); - assert(hdr.sb.st_atime == -315622800); - assert(hdr.sb.st_ctime == 1543015908); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data3", fd, buffer, 5) == 0); @@ -130,8 +120,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542909670); - assert(hdr.sb.st_atime == 1542909708); - assert(hdr.sb.st_ctime == 1542909670); assert(strcmp(hdr.name, filename) == 0); assert(!hdr.unknown_record); assert(read_data("data4", fd, buffer, 5) == 0); diff --git a/tests/tar_ustar.c b/tests/tar_ustar.c index 187128a..d497b15 100644 --- a/tests/tar_ustar.c +++ b/tests/tar_ustar.c @@ -48,8 +48,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542905892); - assert(hdr.sb.st_atime == 1542905892); - assert(hdr.sb.st_ctime == 1542905892); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data0", fd, buffer, 5) == 0); @@ -65,8 +63,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542905892); - assert(hdr.sb.st_atime == 1542905892); - assert(hdr.sb.st_ctime == 1542905892); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data1", fd, buffer, 5) == 0); @@ -82,8 +78,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542905892); - assert(hdr.sb.st_atime == 1542905892); - assert(hdr.sb.st_ctime == 1542905892); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data2", fd, buffer, 5) == 0); @@ -99,8 +93,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 8589934592); assert(hdr.sb.st_mtime == 013375730126); - assert(hdr.sb.st_atime == 013375730126); - assert(hdr.sb.st_ctime == 013375730126); assert(strcmp(hdr.name, "big-file.bin") == 0); assert(!hdr.unknown_record); clear_header(&hdr); @@ -113,8 +105,6 @@ int main(void) assert(hdr.sb.st_gid == 8388608); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 013376036700); - assert(hdr.sb.st_atime == 013376036700); - assert(hdr.sb.st_ctime == 013376036700); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data3", fd, buffer, 5) == 0); @@ -130,8 +120,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 8589934592); - assert(hdr.sb.st_atime == 8589934592); - assert(hdr.sb.st_ctime == 8589934592); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data4", fd, buffer, 5) == 0); @@ -147,8 +135,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1542909670); - assert(hdr.sb.st_atime == 1542909670); - assert(hdr.sb.st_ctime == 1542909670); assert(strcmp(hdr.name, filename) == 0); assert(!hdr.unknown_record); assert(read_data("data5", fd, buffer, 5) == 0); diff --git a/tests/tar_xattr_bsd.c b/tests/tar_xattr_bsd.c index 9bb6d85..360448f 100644 --- a/tests/tar_xattr_bsd.c +++ b/tests/tar_xattr_bsd.c @@ -43,8 +43,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1543094477); - assert(hdr.sb.st_atime == 1543094642); - assert(hdr.sb.st_ctime == 1543094606); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data0", fd, buffer, 5) == 0); diff --git a/tests/tar_xattr_schily.c b/tests/tar_xattr_schily.c index c8b85c8..e49bdd9 100644 --- a/tests/tar_xattr_schily.c +++ b/tests/tar_xattr_schily.c @@ -43,8 +43,6 @@ int main(void) assert(hdr.sb.st_gid == 01750); assert(hdr.sb.st_size == 5); assert(hdr.sb.st_mtime == 1543094477); - assert(hdr.sb.st_atime == 1543094642); - assert(hdr.sb.st_ctime == 1543094606); assert(strcmp(hdr.name, "input.txt") == 0); assert(!hdr.unknown_record); assert(read_data("data0", fd, buffer, 5) == 0); -- cgit v1.2.3