From 56f0ae2f4a38746c3400b065b63323bd7a3f9f5c Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Tue, 3 Jan 2017 11:56:09 -0500
Subject: [PATCH] Added a platform specific define for tzname.
---
tsk/base/tsk_os.h | 2 ++
tsk/fs/fs_name.c | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tsk/base/tsk_os.h b/tsk/base/tsk_os.h
index e2ab09480..e708f5723 100644
--- a/tsk/base/tsk_os.h
+++ b/tsk/base/tsk_os.h
@@ -145,6 +145,7 @@ typedef WCHAR TSK_TCHAR; ///< Character data type that is UTF-16 (wchar_t
#define TSNPRINTF _snwprintf
#define TPUTENV _wputenv
#define TZSET _tzset
+#define TZNAME _tzname
#if defined(_MSC_VER)
#define TSTRTOULL _wcstoui64
@@ -197,6 +198,7 @@ typedef char TSK_TCHAR; ///< Character data type that is UTF-16 (wchar_t
#define TPUTENV putenv
#define TZSET tzset
+#define TZNAME tzname
#define PRIcTSK _TSK_T("s") ///< sprintf macro to print a UTF-8 char string to TSK_TCHAR buffer
#define PRIwTSK _TSK_T("S") ///< sprintf macro to print a UTF-16 wchar_t string to TSK_TCHAR buffer
diff --git a/tsk/fs/fs_name.c b/tsk/fs/fs_name.c
index bac11cb32..c570c8dd2 100644
--- a/tsk/fs/fs_name.c
+++ b/tsk/fs/fs_name.c
@@ -305,7 +305,7 @@ tsk_fs_time_to_str(time_t time, char buf[128])
(int) tmTime->tm_mon + 1, (int) tmTime->tm_mday,
tmTime->tm_hour,
(int) tmTime->tm_min, (int) tmTime->tm_sec,
- _tzname[(tmTime->tm_isdst == 0) ? 0 : 1]);
+ TZNAME[(tmTime->tm_isdst == 0) ? 0 : 1]);
}
return buf;
}
@@ -334,7 +334,7 @@ tsk_fs_time_to_str_subsecs(time_t time, unsigned int subsecs,
(int) tmTime->tm_mon + 1, (int) tmTime->tm_mday,
tmTime->tm_hour,
(int) tmTime->tm_min, (int) tmTime->tm_sec,
- subsecs, _tzname[(tmTime->tm_isdst == 0) ? 0 : 1]);
+ subsecs, TZNAME[(tmTime->tm_isdst == 0) ? 0 : 1]);
}
return buf;
}
@@ -373,7 +373,7 @@ tsk_fs_print_day(FILE * hFile, time_t time)
tsk_fprintf(hFile, "%.4d-%.2d-%.2d 00:00:00 (%s)",
(int) tmTime->tm_year + 1900,
(int) tmTime->tm_mon + 1, (int) tmTime->tm_mday,
- _tzname[(tmTime->tm_isdst == 0) ? 0 : 1]);
+ TZNAME[(tmTime->tm_isdst == 0) ? 0 : 1]);
}
}
--
GitLab