mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2297_incremental_tar_empty_dirs'

Browse Source 
* 2297_incremental_tar_empty_dirs:
  Ticket #2297:  show empty directories in incremental tar archives.
This commit is contained in:
Andrew Borodin 2017-05-04 09:54:44 +03:00
commit cea0973393
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@ tar_fill_stat (struct vfs_s_super *archive, struct stat *st, union record *heade
* know about the other modes but I think I cause no new * know about the other modes but I think I cause no new
* problem when I adjust them, too. -- Norbert. * problem when I adjust them, too. -- Norbert.
*/ */
if (header->header.linkflag == LF_DIR) if (header->header.linkflag == LF_DIR || header->header.linkflag == LF_DUMPDIR)
st->st_mode |= S_IFDIR; st->st_mode |= S_IFDIR;
else if (header->header.linkflag == LF_SYMLINK) else if (header->header.linkflag == LF_SYMLINK)
st->st_mode |= S_IFLNK; st->st_mode |= S_IFLNK;
@ -554,15 +554,10 @@ tar_read_header (struct vfs_class *me, struct vfs_s_super *archive, int tard, si
else else
*h_size = tar_from_oct (1 + 12, header->header.size); *h_size = tar_from_oct (1 + 12, header->header.size);
/*
* Skip over directory snapshot info records that
* are stored in incremental tar archives.
*/
if (header->header.linkflag == LF_DUMPDIR) if (header->header.linkflag == LF_DUMPDIR)
{ {
if (arch->type == TAR_UNKNOWN) if (arch->type == TAR_UNKNOWN)
arch->type = TAR_GNU; arch->type = TAR_GNU;
return STATUS_SUCCESS;
} }
/* /*