wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

Merge branch 'libarchive' of https://github.com/yorickvP/nix

Browse source
This commit is contained in:
Eelco Dolstra 2019-12-19 14:47:18 +01:00
commit ee235e764c
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
17 changed files with 128 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nix-rust/src/util/mod.rs
View file

@ -1,2 +1 @@
pub mod base32;
pub mod tarfile;

56
nix-rust/src/util/tarfile.rs
View file

@ -1,56 +0,0 @@
use crate::{foreign::Source, Error};
use std::fs;
use std::io;
use std::os::unix::fs::OpenOptionsExt;
use std::path::{Component, Path};
use tar::Archive;
pub fn unpack_tarfile(source: Source, dest_dir: &Path) -> Result<(), Error> {
fs::create_dir_all(dest_dir)?;
let mut tar = Archive::new(source);
for file in tar.entries()? {
let mut file = file?;
let path = file.path()?;
for i in path.components() {
if let Component::Prefix(_) | Component::RootDir | Component::ParentDir = i {
return Err(Error::BadTarFileMemberName(
file.path()?.to_str().unwrap().to_string(),
));
}
}
let dest_file = dest_dir.join(path);
fs::create_dir_all(dest_file.parent().unwrap())?;
match file.header().entry_type() {
tar::EntryType::Directory => {
fs::create_dir(dest_file)?;
}
tar::EntryType::Regular => {
let mode = if file.header().mode()? & (libc::S_IXUSR as u32) == 0 {
0o666
} else {
0o777
};
let mut f = fs::OpenOptions::new()
.create(true)
.write(true)
.mode(mode)
.open(dest_file)?;
io::copy(&mut file, &mut f)?;
}
tar::EntryType::Symlink => {
std::os::unix::fs::symlink(file.header().link_name()?.unwrap(), dest_file)?;
}
tar::EntryType::XGlobalHeader | tar::EntryType::XHeader => {}
t => return Err(Error::Misc(format!("unsupported tar entry type '{:?}'", t))),
}
}
Ok(())
}