diff options
author | obrien <obrien@FreeBSD.org> | 2008-02-02 07:19:01 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2008-02-02 07:19:01 +0000 |
commit | b8fb0b4b01c6ec73c5a25ae688d15c7eaf8d1d8f (patch) | |
tree | 542121bbec1b74a6b840e94ccfd2f278aa7a2e0a /contrib/file | |
parent | 6678cf7c2ac8c768ea5efe9fe0392f07e522c963 (diff) | |
download | FreeBSD-src-b8fb0b4b01c6ec73c5a25ae688d15c7eaf8d1d8f.zip FreeBSD-src-b8fb0b4b01c6ec73c5a25ae688d15c7eaf8d1d8f.tar.gz |
Fix nit in version 4.23 in which -p does not work (thus updating access
times when it shouldn't). The PR's patch has been incorporated upstream
as magic.c rev 1.46.
PR: 107676
Submitted by: Dr. Markus Waldeck <waldeck@gmx.de>
Diffstat (limited to 'contrib/file')
-rw-r--r-- | contrib/file/magic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/file/magic.c b/contrib/file/magic.c index 84d7c95..8fba30b 100644 --- a/contrib/file/magic.c +++ b/contrib/file/magic.c @@ -218,6 +218,7 @@ close_and_restore(const struct magic_set *ms, const char *name, int fd, */ #ifdef HAVE_UTIMES struct timeval utsbuf[2]; + memset(utsbuf, 0, sizeof(struct timeval) * 2); utsbuf[0].tv_sec = sb->st_atime; utsbuf[1].tv_sec = sb->st_mtime; @@ -225,6 +226,7 @@ close_and_restore(const struct magic_set *ms, const char *name, int fd, #elif defined(HAVE_UTIME_H) || defined(HAVE_SYS_UTIME_H) struct utimbuf utbuf; + memset(&utbuf, 0, sizeof(struct utimbuf)); utbuf.actime = sb->st_atime; utbuf.modtime = sb->st_mtime; (void) utime(name, &utbuf); /* don't care if loses */ |