timestamp.c: check fstat(2) instead of separate stat(2)

diff --git a/timestamp.c b/timestamp.c
index 75a3af7cbf6572bfa7086d83bf33654b69f5948f..c7edb56409e109aea271e04b9ad51f5e5e21cfac 100644 (file)
--- a/timestamp.c
+++ b/timestamp.c
@@ -202,6 +202,8 @@ timestamp_check(int fd, int secs)
 
        if (fstat(fd, &st) == -1)
                err(1, "fstat");
 
        if (fstat(fd, &st) == -1)
                err(1, "fstat");

+       if (st.st_uid != 0 || st.st_gid != getgid() || st.st_mode != (S_IFREG | 0000))
+               errx(1, "timestamp uid, gid or mode wrong");

 
        if (!timespecisset(&st.st_atim) || !timespecisset(&st.st_mtim)) {
                warnx("timestamp atim or mtime not set");
 
        if (!timespecisset(&st.st_atim) || !timespecisset(&st.st_mtim)) {
                warnx("timestamp atim or mtime not set");


@@ -254,9 +256,6 @@ timestamp_open(int *valid, int secs)
        if (timestamp_path(path, sizeof path) == -1)
                return -1;
 
        if (timestamp_path(path, sizeof path) == -1)
                return -1;
 

-       if (stat(path, &st) != -1 && (st.st_uid != 0 || st.st_gid != getgid()|| st.st_mode != (S_IFREG | 0000)))
-               return -1;
-

        fd = open(path, O_RDONLY|O_NOFOLLOW);
        if (fd == -1) {
                char tmp[256];
        fd = open(path, O_RDONLY|O_NOFOLLOW);
        if (fd == -1) {
                char tmp[256];