diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2010-07-13 01:42:03 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-12 17:34:46 -0700 |
| commit | ded2d47668c8e865465a7ad69665696f9b56f24b (patch) | |
| tree | 5afefec6bafa9941d0186a57d1cc0087baada22e | |
| parent | Git 1.7.1.1 (diff) | |
| download | tgif-ded2d47668c8e865465a7ad69665696f9b56f24b.tar.xz | |
mingw_utime(): handle NULL times parameter
POSIX sayeth:
"If times is a null pointer, the access and modification
times of the file shall be set to the current time."
Let's do so.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 9a8e336582..24333cb167 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -304,8 +304,13 @@ int mingw_utime (const char *file_name, const struct utimbuf *times) goto revert_attrs; } - time_t_to_filetime(times->modtime, &mft); - time_t_to_filetime(times->actime, &aft); + if (times) { + time_t_to_filetime(times->modtime, &mft); + time_t_to_filetime(times->actime, &aft); + } else { + GetSystemTimeAsFileTime(&mft); + aft = mft; + } if (!SetFileTime((HANDLE)_get_osfhandle(fh), NULL, &aft, &mft)) { errno = EINVAL; rc = -1; |