Merge pull request #946 from aschnell/master

aschnell · web-flow · commit ebf5c4f74aa4 · 2024-10-21T06:52:33.000Z
- more defensive programming
diff --git a/snapper/FileUtils.cc b/snapper/FileUtils.cc
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) [2011-2014] Novell, Inc.
- * Copyright (c) [2018-2023] SUSE LLC
+ * Copyright (c) [2018-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -388,6 +388,10 @@ namespace snapper
     SDir::statvfs() const
     {
 	struct statvfs fsbuf;
+
+	static_assert(sizeof(fsbuf.f_blocks) == 8);
+	static_assert(sizeof(fsbuf.f_bavail) == 8);
+
 	if (fstatvfs(dirfd, &fsbuf) != 0)
 	    SN_THROW(IOErrorException(sformat("statvfs failed path:%s errno:%d (%s)", base_path.c_str(),
 					      errno, stringerror(errno).c_str())));

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright (c) [2011-2014] Novell, Inc.`
`3`		`- * Copyright (c) [2018-2023] SUSE LLC`
	`3`	`+ * Copyright (c) [2018-2024] SUSE LLC`
`4`	`4`	`*`
`5`	`5`	`* All Rights Reserved.`
`6`	`6`	`*`
`@@ -388,6 +388,10 @@ namespace snapper`
`388`	`388`	`SDir::statvfs() const`
`389`	`389`	`{`
`390`	`390`	`struct statvfs fsbuf;`
	`391`	`+`
	`392`	`+ static_assert(sizeof(fsbuf.f_blocks) == 8);`
	`393`	`+ static_assert(sizeof(fsbuf.f_bavail) == 8);`
	`394`	`+`
`391`	`395`	`if (fstatvfs(dirfd, &fsbuf) != 0)`
`392`	`396`	`SN_THROW(IOErrorException(sformat("statvfs failed path:%s errno:%d (%s)", base_path.c_str(),`
`393`	`397`	`errno, stringerror(errno).c_str())));`