mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-09 13:02:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket 1952: fix wrong timestamps "Jan 1, 1970" int tar archives.

Browse Source 
(tar_insert_entry): assign timestamps after header decoding.
(tar_fill_stat): remove irrelevant #ifdef & #endif.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-05-24 20:45:16 +03:00
parent 0d5a989e7e
commit 25a445ed88
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vfs/tar/tar.c
View File

@ -489,11 +489,10 @@ tar_fill_stat (struct vfs_s_super *archive, union block *header)
break; break;
} }
#ifdef HAVE_STRUCT_STAT_ST_MTIM
current_stat_info.atime.tv_nsec = 0; current_stat_info.atime.tv_nsec = 0;
current_stat_info.mtime.tv_nsec = 0; current_stat_info.mtime.tv_nsec = 0;
current_stat_info.ctime.tv_nsec = 0; current_stat_info.ctime.tv_nsec = 0;
#endif
current_stat_info.mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime); current_stat_info.mtime.tv_sec = TIME_FROM_HEADER (header->header.mtime);
if (arch->type == TAR_GNU || arch->type == TAR_OLDGNU) if (arch->type == TAR_GNU || arch->type == TAR_OLDGNU)
{ {
@ -580,6 +579,10 @@ tar_insert_entry (struct vfs_class *me, struct vfs_s_super *archive, union block
} }
*inode = vfs_s_new_inode (me, archive, &current_stat_info.stat); *inode = vfs_s_new_inode (me, archive, &current_stat_info.stat);
/* assgin timestamps after decoding of extended headers */
(*inode)->st.st_mtime = current_stat_info.mtime.tv_sec;
(*inode)->st.st_atime = current_stat_info.atime.tv_sec;
(*inode)->st.st_ctime = current_stat_info.ctime.tv_sec;
(*inode)->data_offset = BLOCKSIZE * tar_current_block_ordinal (TAR_SUPER (archive)); (*inode)->data_offset = BLOCKSIZE * tar_current_block_ordinal (TAR_SUPER (archive));
if (link_name != NULL && *link_name != '\0') if (link_name != NULL && *link_name != '\0')