diff options
author | dim <dim@FreeBSD.org> | 2015-02-17 19:53:41 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-17 19:53:41 +0000 |
commit | d27bd4650ea928097e260433cb5c69be0dda440f (patch) | |
tree | 9b840acec4a7a5a64b3092e4f4cbb8197e629360 /usr.bin/compress/compress.c | |
parent | 9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe (diff) | |
parent | 68a4902d98c88ebff2f1dfd8bee849d62233ba60 (diff) | |
download | FreeBSD-src-d27bd4650ea928097e260433cb5c69be0dda440f.zip FreeBSD-src-d27bd4650ea928097e260433cb5c69be0dda440f.tar.gz |
Merge ^/head r278756 through r278915.
Diffstat (limited to 'usr.bin/compress/compress.c')
-rw-r--r-- | usr.bin/compress/compress.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c index 1f458e5..2d2efb3 100644 --- a/usr.bin/compress/compress.c +++ b/usr.bin/compress/compress.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> +#include <fcntl.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -360,14 +361,14 @@ err: if (ofp) { static void setfile(const char *name, struct stat *fs) { - static struct timeval tv[2]; + static struct timespec tspec[2]; fs->st_mode &= S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO; - TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim); - TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim); - if (utimes(name, tv)) - cwarn("utimes: %s", name); + tspec[0] = fs->st_atim; + tspec[1] = fs->st_mtim; + if (utimensat(AT_FDCWD, name, tspec, 0)) + cwarn("utimensat: %s", name); /* * Changing the ownership probably won't succeed, unless we're root |