*: make it easier to distinquish "struct tm", pointer to one, etc

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 21 insertions, 13 deletions

diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libunarchive/header_verbose_list.c
index da21a15af..f6f04cfd5 100644
--- a/archival/libunarchive/header_verbose_list.c
+++ b/archival/libunarchive/header_verbose_list.c
@@ -8,7 +8,8 @@
 
 void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 {
-        struct tm *mtime = localtime(&(file_header->mtime));
+        struct tm tm_time;
+        struct tm *ptm = &tm_time; //localtime(&file_header->mtime);
 
 #if ENABLE_FEATURE_TAR_UNAME_GNAME
         char uid[sizeof(int)*3 + 2];
@@ -16,6 +17,8 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
         char *user;
         char *group;
 
+        localtime_r(&file_header->mtime, ptm);
+
         user = file_header->tar__uname;
         if (user == NULL) {
                 sprintf(uid, "%u", (unsigned)file_header->uid);
@@ -31,26 +34,31 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
                 user,
                 group,
                 file_header->size,
-                1900 + mtime->tm_year,
-                1 + mtime->tm_mon,
-                mtime->tm_mday,
-                mtime->tm_hour,
-                mtime->tm_min,
-                mtime->tm_sec,
+                1900 + ptm->tm_year,
+                1 + ptm->tm_mon,
+                ptm->tm_mday,
+                ptm->tm_hour,
+                ptm->tm_min,
+                ptm->tm_sec,
                 file_header->name);
+
 #else /* !FEATURE_TAR_UNAME_GNAME */
+
+        localtime_r(&file_header->mtime, ptm);
+
         printf("%s %u/%u %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
                 bb_mode_string(file_header->mode),
                 (unsigned)file_header->uid,
                 (unsigned)file_header->gid,
                 file_header->size,
-                1900 + mtime->tm_year,
-                1 + mtime->tm_mon,
-                mtime->tm_mday,
-                mtime->tm_hour,
-                mtime->tm_min,
-                mtime->tm_sec,
+                1900 + ptm->tm_year,
+                1 + ptm->tm_mon,
+                ptm->tm_mday,
+                ptm->tm_hour,
+                ptm->tm_min,
+                ptm->tm_sec,
                 file_header->name);
+
 #endif /* FEATURE_TAR_UNAME_GNAME */
 
         if (file_header->link_target) {