From c331df4f2324540e80c40ae3b6a2e779a4846d58 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 2 Feb 2008 07:19:01 +0000 Subject: [PATCH] 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 --- contrib/file/magic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/file/magic.c b/contrib/file/magic.c index 84d7c95d8bbf..8fba30bfab1b 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 */