d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract device number information from SVR4 CPIO archives.

Browse Source 
Without this, you cannot properly restore device node entries
from such archives.

Thanks to: Steve 'dillo Okay for reporting this oversight.
This commit is contained in:
Tim Kientzle 2006-02-14 04:00:14 +00:00
parent 4f6ac14677
commit f26dacb29e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=155653
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libarchive/archive_read_support_format_cpio.c
View File

@ -336,11 +336,17 @@ header_newc(struct archive *a, struct cpio *cpio, struct stat *st,
/* TODO: Abort here? */
}
st->st_dev = makedev(
atol16(header->c_devmajor, sizeof(header->c_devmajor)),
atol16(header->c_devminor, sizeof(header->c_devminor)));
st->st_ino = atol16(header->c_ino, sizeof(header->c_ino));
st->st_mode = atol16(header->c_mode, sizeof(header->c_mode));
st->st_uid = atol16(header->c_uid, sizeof(header->c_uid));
st->st_gid = atol16(header->c_gid, sizeof(header->c_gid));
st->st_nlink = atol16(header->c_nlink, sizeof(header->c_nlink));
st->st_rdev = makedev(
atol16(header->c_rdevmajor, sizeof(header->c_rdevmajor)),
atol16(header->c_rdevminor, sizeof(header->c_rdevminor)));
st->st_mtime = atol16(header->c_mtime, sizeof(header->c_mtime));
*namelength = atol16(header->c_namesize, sizeof(header->c_namesize));
/* Pad name to 2 more than a multiple of 4. */