Module Name: src
Committed By: perseant
Date: Wed Jul 31 03:43:16 UTC 2024
Modified Files:
src/sys/fs/exfatfs [perseant-exfatfs]: exfatfs_conv.c
Log Message:
Explicitly use GMT when interpreting DOS time.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/fs/exfatfs/exfatfs_conv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/exfatfs/exfatfs_conv.c
diff -u src/sys/fs/exfatfs/exfatfs_conv.c:1.1.2.2 src/sys/fs/exfatfs/exfatfs_conv.c:1.1.2.3
--- src/sys/fs/exfatfs/exfatfs_conv.c:1.1.2.2 Mon Jul 1 22:15:21 2024
+++ src/sys/fs/exfatfs/exfatfs_conv.c Wed Jul 31 03:43:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exfatfs_conv.c,v 1.1.2.2 2024/07/01 22:15:21 perseant Exp $ */
+/* $NetBSD: exfatfs_conv.c,v 1.1.2.3 2024/07/31 03:43:16 perseant Exp $ */
/*-
* Copyright (c) 2022, 2024 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exfatfs_conv.c,v 1.1.2.2 2024/07/01 22:15:21 perseant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exfatfs_conv.c,v 1.1.2.3 2024/07/31 03:43:16 perseant Exp $");
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
@@ -304,10 +304,10 @@ exfatfs_dos2unixtime(uint32_t dt, uint8_
tm.tm_hour = (dt & DT_HOURS_MASK) >> DT_HOURS_SHIFT;
tm.tm_min = (dt & DT_MINUTES_MASK) >> DT_MINUTES_SHIFT;
tm.tm_sec = ((dt & DT_2SECONDS_MASK) >> DT_2SECONDS_SHIFT) * 2;
- tm.tm_isdst = 0; /* XXX */
+ tm.tm_isdst = -1;
tm.tm_gmtoff = 0;
- seconds = mktime(&tm);
+ seconds = mktime_z(NULL, &tm);
tsp->tv_sec = seconds;
tsp->tv_sec -= gmtoff; /* time zone correction */
tsp->tv_nsec = (dh % 100) * 10000000;
