Compare commits

..

9 Commits

Author SHA1 Message Date
Philipp Schuster
57a0f950ef
Merge pull request #7 from schnoberts1/bugfix-entry-type-enum
Fix the values in typeflag so they match https://www.gnu.org/software
2023-08-30 17:54:57 +02:00
Andy Schneider
f598cb3f9f Fix the values in typeflag so they match https://www.gnu.org/software/tar/manual/html_node/Standard.html. i.e DIRTYPE is b'5' not 5. 2023-08-27 12:55:21 +01:00
Philipp Schuster
382c10c217
Merge pull request #5 from phip1611/dev
v0.2.0
2023-04-11 13:08:27 +02:00
Philipp Schuster
3eccc3c199 ci: add typos check 2023-04-11 12:33:28 +02:00
Philipp Schuster
1412663d2c prepare v0.2.0 with code improvements 2023-04-11 12:09:15 +02:00
Philipp Schuster
547429a3dd
Merge pull request #4 from semiviral/main
update bitflags dependency `1.3` -> `2.0`
2023-04-11 10:39:45 +02:00
semiviral
e417692b46 undo version bump 2023-04-02 08:27:47 -05:00
semiviral
c8c12e7c0b #[repr(transparent)] for ModeFlags 2023-04-02 06:15:42 -05:00
semiviral
48bec03dfe update bitflags 1.3 -> 2.0 2023-04-02 06:06:21 -05:00
12 changed files with 181 additions and 128 deletions

View File

@ -9,6 +9,7 @@ insert_final_newline = true
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
trim_trailing_whitespace = true trim_trailing_whitespace = true
max_line_length = 80
[*.yml] [*.yml]
indent_size = 2 indent_size = 2

12
.github/workflows/qa.yml vendored Normal file
View File

@ -0,0 +1,12 @@
name: QA
on: [ push, pull_request ]
jobs:
spellcheck:
name: Spellcheck
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
# Executes "typos ."
- uses: crate-ci/typos@v1.13.20

View File

@ -1,23 +1,22 @@
name: Build name: Build
on: on: [push, pull_request]
push:
branches: [ main ]
pull_request:
branches: [ main ]
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ${{ matrix.runs-on }}
strategy: strategy:
matrix: matrix:
runs-on:
- windows-latest
- ubuntu-latest
rust: rust:
- stable - stable
- nightly - nightly
- 1.52.1 # MSVR - 1.60.0 # MSVR
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Important preparation step: override the latest default Rust version in GitHub CI # Important preparation step: override the latest default Rust version in GitHub CI
@ -28,21 +27,21 @@ jobs:
toolchain: ${{ matrix.rust }} toolchain: ${{ matrix.rust }}
override: true override: true
- name: Build - name: Build
run: cargo build --all-targets --verbose --features all run: cargo build --all-targets --verbose --features alloc
# use some arbitrary no_std target # use some arbitrary no_std target
- name: Install no_std target thumbv7em-none-eabihf - name: Install no_std target thumbv7em-none-eabihf
run: rustup target add thumbv7em-none-eabihf run: rustup target add thumbv7em-none-eabihf
- name: Build (no_std) - name: Build (no_std)
run: cargo build --verbose --target thumbv7em-none-eabihf --features all run: cargo build --verbose --target thumbv7em-none-eabihf --features alloc
- name: Run tests - name: Run tests
run: cargo test --verbose --features all run: cargo test --verbose --features alloc
style_checks: style_checks:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
rust: rust:
- stable - 1.60.0
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
# Important preparation step: override the latest default Rust version in GitHub CI # Important preparation step: override the latest default Rust version in GitHub CI
@ -55,6 +54,6 @@ jobs:
- name: Rustfmt - name: Rustfmt
run: cargo fmt -- --check run: cargo fmt -- --check
- name: Clippy - name: Clippy
run: cargo clippy --features all run: cargo clippy --features alloc
- name: Rustdoc - name: Rustdoc
run: cargo doc --features all run: cargo doc --no-deps --document-private-items --features alloc

6
CHANGELOG.md Normal file
View File

@ -0,0 +1,6 @@
# v0.2.0 (2023-04-11)
- MSRV is 1.60.0
- bitflags bump: 1.x -> 2.x
- few internal code improvements (less possible panics)
- `Mode::to_flags` now returns a Result
- Feature `all` was removed. Use `alloc` instead.

View File

@ -7,8 +7,8 @@ as GNU Longname. The maximum supported file name length is 100 characters includ
The maximum supported file size is 8GiB. Also, directories are not supported yet but only flat The maximum supported file size is 8GiB. Also, directories are not supported yet but only flat
collections of files. collections of files.
""" """
version = "0.1.8" version = "0.2.0"
edition = "2018" edition = "2021"
keywords = ["tar", "tarball", "archive"] keywords = ["tar", "tarball", "archive"]
categories = ["data-structures", "no-std", "parser-implementations"] categories = ["data-structures", "no-std", "parser-implementations"]
readme = "README.md" readme = "README.md"
@ -23,12 +23,11 @@ resolver = "2"
[features] [features]
default = [] default = []
alloc = [] alloc = []
all = ["alloc"]
[dependencies] [dependencies]
bitflags = "1.3"
arrayvec = { version = "0.7", default-features = false } arrayvec = { version = "0.7", default-features = false }
bitflags = "2.0"
log = { version = "0.4", default-features = false } log = { version = "0.4", default-features = false }
[dev-dependencies] [dev-dependencies]
env_logger = "0.9" env_logger = "0.10"

View File

@ -39,7 +39,7 @@ fn main() {
let entries = archive.entries().collect::<Vec<_>>(); let entries = archive.entries().collect::<Vec<_>>();
println!("{:#?}", entries); println!("{:#?}", entries);
println!("content of last file:"); println!("content of last file:");
println!("{:#?}", entries[2].data_as_str().expect("Invalid UTF-8") ); println!("{:#?}", entries[2].data_as_str().expect("Should be valid UTF-8"));
} }
``` ```

View File

@ -1,11 +1,11 @@
#!/usr/bin/bash #!/usr/bin/env bash
cargo build --all-targets --verbose --features all cargo build --all-targets --verbose --features alloc
# use some random no_std target # use some random no_std target
rustup target add thumbv7em-none-eabihf rustup target add thumbv7em-none-eabihf
cargo build --verbose --target thumbv7em-none-eabihf --features all cargo build --verbose --target thumbv7em-none-eabihf --features alloc
cargo test --verbose --features all cargo test --verbose --features alloc
cargo fmt -- --check cargo fmt -- --check
cargo clippy --features all cargo +1.60.0 clippy --features alloc
cargo doc --features all cargo +1.60.0 doc --no-deps --document-private-items --features alloc

View File

@ -1,7 +1,7 @@
/* /*
MIT License MIT License
Copyright (c) 2021 Philipp Schuster Copyright (c) 2023 Philipp Schuster
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -37,5 +37,8 @@ fn main() {
let entries = archive.entries().collect::<Vec<_>>(); let entries = archive.entries().collect::<Vec<_>>();
println!("{:#?}", entries); println!("{:#?}", entries);
println!("content of last file:"); println!("content of last file:");
println!("{:#?}", entries[2].data_as_str().expect("Invalid UTF-8")); println!(
"{:#?}",
entries[2].data_as_str().expect("Should be valid UTF-8")
);
} }

View File

@ -1,7 +1,7 @@
/* /*
MIT License MIT License
Copyright (c) 2021 Philipp Schuster Copyright (c) 2023 Philipp Schuster
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -35,5 +35,8 @@ fn main() {
let entries = archive.entries().collect::<Vec<_>>(); let entries = archive.entries().collect::<Vec<_>>();
println!("{:#?}", entries); println!("{:#?}", entries);
println!("content of last file:"); println!("content of last file:");
println!("{:#?}", entries[2].data_as_str().expect("Invalid UTF-8")); println!(
"{:#?}",
entries[2].data_as_str().expect("Should be valid UTF-8")
);
} }

View File

@ -1,7 +1,7 @@
/* /*
MIT License MIT License
Copyright (c) 2021 Philipp Schuster Copyright (c) 2023 Philipp Schuster
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -25,24 +25,25 @@ SOFTWARE.
//! also exports `TarArchive`, which owns data on the heap. //! also exports `TarArchive`, which owns data on the heap.
use crate::header::PosixHeader; use crate::header::PosixHeader;
use crate::{TypeFlag, BLOCKSIZE}; use crate::{TypeFlag, BLOCKSIZE, FILENAME_MAX_LEN};
#[cfg(feature = "alloc")] #[cfg(feature = "alloc")]
use alloc::boxed::Box; use alloc::boxed::Box;
use arrayvec::ArrayString; use arrayvec::ArrayString;
use core::fmt::{Debug, Formatter}; use core::fmt::{Debug, Formatter};
use core::str::{FromStr, Utf8Error}; use core::str::{FromStr, Utf8Error};
use log::warn;
/// Describes an entry in an archive. /// Describes an entry in an archive.
/// Currently only supports files but no directories. /// Currently only supports files but no directories.
pub struct ArchiveEntry<'a> { pub struct ArchiveEntry<'a> {
filename: ArrayString<100>, filename: ArrayString<FILENAME_MAX_LEN>,
data: &'a [u8], data: &'a [u8],
size: usize, size: usize,
} }
#[allow(unused)] #[allow(unused)]
impl<'a> ArchiveEntry<'a> { impl<'a> ArchiveEntry<'a> {
pub const fn new(filename: ArrayString<100>, data: &'a [u8]) -> Self { const fn new(filename: ArrayString<FILENAME_MAX_LEN>, data: &'a [u8]) -> Self {
ArchiveEntry { ArchiveEntry {
filename, filename,
data, data,
@ -50,8 +51,9 @@ impl<'a> ArchiveEntry<'a> {
} }
} }
/// Filename of the entry. Max 99 characters. /// Filename of the entry with a maximum of 100 characters (including the
pub const fn filename(&self) -> ArrayString<100> { /// terminating NULL-byte).
pub const fn filename(&self) -> ArrayString<{ FILENAME_MAX_LEN }> {
self.filename self.filename
} }
@ -122,13 +124,6 @@ impl From<Box<[u8]>> for TarArchive {
} }
} }
/*#[cfg(feature = "alloc")]
impl Into<Box<[u8]>> for TarArchive {
fn into(self) -> Box<[u8]> {
self.data
}
}*/
#[cfg(feature = "alloc")] #[cfg(feature = "alloc")]
impl From<TarArchive> for Box<[u8]> { impl From<TarArchive> for Box<[u8]> {
fn from(ar: TarArchive) -> Self { fn from(ar: TarArchive) -> Self {
@ -137,7 +132,7 @@ impl From<TarArchive> for Box<[u8]> {
} }
/// Wrapper type around bytes, which represents a Tar archive. /// Wrapper type around bytes, which represents a Tar archive.
/// Unlike [`TarArchive`], this uses only a reference to data. /// Unlike [`TarArchive`], this uses only a reference to the data.
#[derive(Debug)] #[derive(Debug)]
pub struct TarArchiveRef<'a> { pub struct TarArchiveRef<'a> {
data: &'a [u8], data: &'a [u8],
@ -193,7 +188,7 @@ impl<'a> Iterator for ArchiveIterator<'a> {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
if self.block_index * BLOCKSIZE >= self.archive_data.len() { if self.block_index * BLOCKSIZE >= self.archive_data.len() {
log::warn!("Reached end of Tar archive data without finding zero/end blocks!"); warn!("Reached end of Tar archive data without finding zero/end blocks!");
return None; return None;
} }
@ -221,28 +216,40 @@ impl<'a> Iterator for ArchiveIterator<'a> {
} }
if hdr.name.is_empty() { if hdr.name.is_empty() {
log::warn!("Found empty file name",); warn!("Found empty file name",);
} }
// fetch data of file from next block(s) let hdr_size = hdr.size.val();
let data_block_count = hdr.payload_block_count(); if let Err(e) = hdr_size {
warn!("Can't parse the file size from the header block. Stop iterating Tar archive. {e:#?}");
return None;
}
let hdr_size = hdr_size.unwrap();
// Fetch data of file from next block(s).
// .unwrap() is fine as we checked that hdr.size().val() is valid
// above
let data_block_count = hdr.payload_block_count().unwrap();
// +1: skip hdr block itself and start at data! // +1: skip hdr block itself and start at data!
// i_begin is the byte begin index of this file in the array of the whole archive // i_begin is the byte begin index of this file in the array of the whole archive
let i_begin = (self.block_index + 1) * BLOCKSIZE; let i_begin = (self.block_index + 1) * BLOCKSIZE;
// i_end is the exclusive byte end index of the data of the current file // i_end is the exclusive byte end index of the data of the current file
let i_end = i_begin + data_block_count * BLOCKSIZE; let i_end = i_begin + data_block_count * BLOCKSIZE;
let file_block_bytes = &self.archive_data[i_begin..i_end]; let file_block_bytes = &self.archive_data[i_begin..i_end];
// because each block is 512 bytes long, the file is not necessarily a multiple of 512 bytes // Each block is 512 bytes long, but the file size is not necessarily a
let file_bytes = &file_block_bytes[0..hdr.size.val()]; // multiple of 512.
let file_bytes = &file_block_bytes[0..hdr_size];
// in next iteration: start at next Archive entry header // in next iteration: start at next Archive entry header
// +1 for current hdr block itself + all data blocks // +1 for current hdr block itself + all data blocks
self.block_index += data_block_count + 1; self.block_index += data_block_count + 1;
Some(ArchiveEntry::new( let filename = ArrayString::from_str(hdr.name.as_string().as_str());
ArrayString::from_str(hdr.name.as_string().as_str()).unwrap(), // .unwrap is fine as the capacity is MUST be ok.
file_bytes, let filename = filename.unwrap();
))
Some(ArchiveEntry::new(filename, file_bytes))
} }
} }
@ -258,24 +265,9 @@ mod tests {
println!("{:#?}", entries); println!("{:#?}", entries);
} }
/// Tests to read the entries from existing archives in various Tar flavors.
#[test] #[test]
fn test_archive_entries() { fn test_archive_entries() {
#[cfg(feature = "alloc")]
{
let data = include_bytes!("../tests/gnu_tar_default.tar")
.to_vec()
.into_boxed_slice();
let archive = TarArchive::new(data.clone());
let entries = archive.entries().collect::<Vec<_>>();
assert_archive_content(&entries);
let archive = TarArchive::from(data.clone());
let entries = archive.entries().collect::<Vec<_>>();
assert_archive_content(&entries);
assert_eq!(data, archive.into());
}
let archive = TarArchiveRef::new(include_bytes!("../tests/gnu_tar_default.tar")); let archive = TarArchiveRef::new(include_bytes!("../tests/gnu_tar_default.tar"));
let entries = archive.entries().collect::<Vec<_>>(); let entries = archive.entries().collect::<Vec<_>>();
assert_archive_content(&entries); assert_archive_content(&entries);
@ -307,30 +299,52 @@ mod tests {
assert_archive_content(&entries); assert_archive_content(&entries);
} }
/// Like [`test_archive_entries`] but with additional `alloc` functionality.
#[cfg(feature = "alloc")]
#[test]
fn test_archive_entries_alloc() {
let data = include_bytes!("../tests/gnu_tar_default.tar")
.to_vec()
.into_boxed_slice();
let archive = TarArchive::new(data.clone());
let entries = archive.entries().collect::<Vec<_>>();
assert_archive_content(&entries);
// Test that the archive can be transformed into owned heap data.
assert_eq!(data, archive.into());
}
/// Tests that the parsed archive matches the expected order. The tarballs
/// the tests directory were created once by me with files in the order
/// specified in this test.
fn assert_archive_content(entries: &[ArchiveEntry]) { fn assert_archive_content(entries: &[ArchiveEntry]) {
assert_eq!(entries.len(), 3); assert_eq!(entries.len(), 3);
// order in that I stored the files into the archive
assert_eq!(entries[0].filename().as_str(), "bye_world_513b.txt"); assert_eq!(entries[0].filename().as_str(), "bye_world_513b.txt");
assert_eq!(entries[0].size(), 513); assert_eq!(entries[0].size(), 513);
assert_eq!(entries[0].data().len(), 513); assert_eq!(entries[0].data().len(), 513);
assert_eq!( assert_eq!(
entries[0].data_as_str().expect("Invalid UTF-8"), entries[0].data_as_str().expect("Should be valid UTF-8"),
include_str!("../tests/bye_world_513b.txt") // .replace: Ensure that the test also works on Windows
include_str!("../tests/bye_world_513b.txt").replace("\r\n", "\n")
); );
// Test that an entry that needs two 512 byte data blocks is read
// properly.
assert_eq!(entries[1].filename().as_str(), "hello_world_513b.txt"); assert_eq!(entries[1].filename().as_str(), "hello_world_513b.txt");
assert_eq!(entries[1].size(), 513); assert_eq!(entries[1].size(), 513);
assert_eq!(entries[1].data().len(), 513); assert_eq!(entries[1].data().len(), 513);
assert_eq!( assert_eq!(
entries[1].data_as_str().expect("Invalid UTF-8"), entries[1].data_as_str().expect("Should be valid UTF-8"),
include_str!("../tests/hello_world_513b.txt") // .replace: Ensure that the test also works on Windows
include_str!("../tests/hello_world_513b.txt").replace("\r\n", "\n")
); );
assert_eq!(entries[2].filename().as_str(), "hello_world.txt"); assert_eq!(entries[2].filename().as_str(), "hello_world.txt");
assert_eq!(entries[2].size(), 12); assert_eq!(entries[2].size(), 12);
assert_eq!(entries[2].data().len(), 12); assert_eq!(entries[2].data().len(), 12);
assert_eq!( assert_eq!(
entries[2].data_as_str().expect("Invalid UTF-8"), entries[2].data_as_str().expect("Should be valid UTF-8"),
"Hello World\n", "Hello World\n",
"file content must match" "file content must match"
); );

View File

@ -1,7 +1,7 @@
/* /*
MIT License MIT License
Copyright (c) 2021 Philipp Schuster Copyright (c) 2023 Philipp Schuster
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -30,9 +30,10 @@ SOFTWARE.
#![allow(non_upper_case_globals)] #![allow(non_upper_case_globals)]
use crate::BLOCKSIZE; use crate::{BLOCKSIZE, FILENAME_MAX_LEN};
use arrayvec::ArrayString; use arrayvec::ArrayString;
use core::fmt::{Debug, Formatter}; use core::fmt::{Debug, Formatter};
use core::num::ParseIntError;
/// The file size is encoded as octal ASCII number inside a Tar header. /// The file size is encoded as octal ASCII number inside a Tar header.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
@ -41,8 +42,8 @@ pub struct Size(StaticCString<12>);
impl Size { impl Size {
/// Returns the octal ASCII number as actual size in bytes. /// Returns the octal ASCII number as actual size in bytes.
pub fn val(&self) -> usize { pub fn val(&self) -> Result<usize, ParseIntError> {
usize::from_str_radix(self.0.as_string().as_str(), 8).unwrap() usize::from_str_radix(self.0.as_string().as_str(), 8)
} }
} }
@ -54,16 +55,24 @@ impl Debug for Size {
} }
} }
#[derive(Debug)]
pub enum ModeError {
ParseInt(ParseIntError),
IllegalMode,
}
/// Wrapper around the UNIX file permissions given in octal ASCII. /// Wrapper around the UNIX file permissions given in octal ASCII.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
#[repr(transparent)] #[repr(transparent)]
pub struct Mode(StaticCString<8>); pub struct Mode(StaticCString<8>);
impl Mode { impl Mode {
pub fn to_flags(self) -> ModeFlags { /// Parses the [`ModeFlags`] from the mode string.
pub fn to_flags(self) -> Result<ModeFlags, ModeError> {
let octal_number_str = self.0.as_string(); let octal_number_str = self.0.as_string();
let bits = u64::from_str_radix(octal_number_str.as_str(), 8).unwrap(); let bits =
ModeFlags::from_bits(bits).unwrap() u64::from_str_radix(octal_number_str.as_str(), 8).map_err(ModeError::ParseInt)?;
ModeFlags::from_bits(bits).ok_or(ModeError::IllegalMode)
} }
} }
@ -75,8 +84,11 @@ impl Debug for Mode {
} }
} }
/// A C-String that is stored in a static array. All unused /// A C-String that is stored in a static array. There is always a terminating
/// chars must be a NULL-byte. /// NULL-byte.
///
/// The content is likely to be UTF-8/ASCII, but that is not verified by this
/// type.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
#[repr(transparent)] #[repr(transparent)]
pub struct StaticCString<const N: usize>([u8; N]); pub struct StaticCString<const N: usize>([u8; N]);
@ -99,19 +111,16 @@ impl<const N: usize> StaticCString<N> {
self.len() == 0 self.len() == 0
} }
/// Returns a string without null bytes. /// Returns a string that includes all characters until the first null.
pub fn as_string(&self) -> ArrayString<N> { pub fn as_string(&self) -> ArrayString<N> {
let mut string = ArrayString::new(); let mut string = ArrayString::new();
// copy all bytes (=ASCII) into string
self.0 self.0
.clone() .clone()
.iter() .iter()
// remove all zero bytes; there is always one .copied()
// zero byte at the end. Furtherore, the other // Take all chars until the terminating null.
// unused bytes are also zero, but not part of the .take_while(|byte| *byte != 0)
// string. .for_each(|byte| string.push(byte as char));
.filter(|x| **x != 0)
.for_each(|b| string.push(*b as char));
string string
} }
} }
@ -145,7 +154,7 @@ impl<const N: usize> Debug for StaticCString<N> {
pub struct PosixHeader { pub struct PosixHeader {
/// Name. There is always a null byte, therefore /// Name. There is always a null byte, therefore
/// the max len is 99. /// the max len is 99.
pub name: StaticCString<100>, pub name: StaticCString<{ FILENAME_MAX_LEN }>,
pub mode: Mode, pub mode: Mode,
pub uid: [u8; 8], pub uid: [u8; 8],
pub gid: [u8; 8], pub gid: [u8; 8],
@ -156,7 +165,7 @@ pub struct PosixHeader {
pub typeflag: TypeFlag, pub typeflag: TypeFlag,
/// Name. There is always a null byte, therefore /// Name. There is always a null byte, therefore
/// the max len is 99. /// the max len is 99.
pub linkname: StaticCString<100>, pub linkname: StaticCString<{ FILENAME_MAX_LEN }>,
pub magic: StaticCString<6>, pub magic: StaticCString<6>,
pub version: StaticCString<2>, pub version: StaticCString<2>,
/// Username. There is always a null byte, therefore /// Username. There is always a null byte, therefore
@ -175,16 +184,14 @@ pub struct PosixHeader {
} }
impl PosixHeader { impl PosixHeader {
/// Returns the number of blocks that are required to /// Returns the number of blocks that are required to read the whole file
/// read the whole file content. /// content. Returns an error, if the file size can't be parsed from the
pub fn payload_block_count(&self) -> usize { /// header.
let div = self.size.val() / BLOCKSIZE; pub fn payload_block_count(&self) -> Result<usize, ParseIntError> {
let modulo = self.size.val() % BLOCKSIZE; let div = self.size.val()? / BLOCKSIZE;
if modulo > 0 { let modulo = self.size.val()? % BLOCKSIZE;
(div + 1) as usize let block_count = if modulo > 0 { div + 1 } else { div };
} else { Ok(block_count)
div as usize
}
} }
/// A Tar archive is terminated, if a end-of-archive entry, which consists of two 512 blocks /// A Tar archive is terminated, if a end-of-archive entry, which consists of two 512 blocks
@ -199,7 +206,7 @@ impl PosixHeader {
/// Describes the kind of payload, that follows after a /// Describes the kind of payload, that follows after a
/// [`PosixHeader`]. The properties of this payload are /// [`PosixHeader`]. The properties of this payload are
/// described inside the header. /// described inside the header.
#[derive(Debug, Copy, Clone, PartialEq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
#[repr(u8)] #[repr(u8)]
#[allow(unused)] #[allow(unused)]
pub enum TypeFlag { pub enum TypeFlag {
@ -216,35 +223,35 @@ pub enum TypeFlag {
/// This flag represents a file linked to another file, of any type, previously archived. Such /// This flag represents a file linked to another file, of any type, previously archived. Such
/// files are identified in Unix by each file having the same device and inode number. The /// files are identified in Unix by each file having the same device and inode number. The
/// linked-to name is specified in the linkname field with a trailing null. /// linked-to name is specified in the linkname field with a trailing null.
LINK = 1, LINK = b'1',
/// This represents a symbolic link to another file. The linked-to name is specified in the /// This represents a symbolic link to another file. The linked-to name is specified in the
/// linkname field with a trailing null. /// linkname field with a trailing null.
SYMTYPE = 2, SYMTYPE = b'2',
/// Represents character special files and block special files respectively. In this case the /// Represents character special files and block special files respectively. In this case the
/// devmajor and devminor fields will contain the major and minor device numbers respectively. /// devmajor and devminor fields will contain the major and minor device numbers respectively.
/// Operating systems may map the device specifications to their own local specification, or /// Operating systems may map the device specifications to their own local specification, or
/// may ignore the entry. /// may ignore the entry.
CHRTYPE = 3, CHRTYPE = b'3',
/// Represents character special files and block special files respectively. In this case the /// Represents character special files and block special files respectively. In this case the
/// devmajor and devminor fields will contain the major and minor device numbers respectively. /// devmajor and devminor fields will contain the major and minor device numbers respectively.
/// Operating systems may map the device specifications to their own local specification, or /// Operating systems may map the device specifications to their own local specification, or
/// may ignore the entry. /// may ignore the entry.
BLKTYPE = 4, BLKTYPE = b'4',
/// This flag specifies a directory or sub-directory. The directory name in the name field /// This flag specifies a directory or sub-directory. The directory name in the name field
/// should end with a slash. On systems where disk allocation is performed on a directory /// should end with a slash. On systems where disk allocation is performed on a directory
/// basis, the size field will contain the maximum number of bytes (which may be rounded to /// basis, the size field will contain the maximum number of bytes (which may be rounded to
/// the nearest disk block allocation unit) which the directory may hold. A size field of zero /// the nearest disk block allocation unit) which the directory may hold. A size field of zero
/// indicates no such limiting. Systems which do not support limiting in this manner should /// indicates no such limiting. Systems which do not support limiting in this manner should
/// ignore the size field. /// ignore the size field.
DIRTYPE = 5, DIRTYPE = b'5',
/// This specifies a FIFO special file. Note that the archiving of a FIFO file archives the /// This specifies a FIFO special file. Note that the archiving of a FIFO file archives the
/// existence of this file and not its contents. /// existence of this file and not its contents.
FIFOTYPE = 6, FIFOTYPE = b'6',
/// This specifies a contiguous file, which is the same as a normal file except that, in /// This specifies a contiguous file, which is the same as a normal file except that, in
/// operating systems which support it, all its space is allocated contiguously on the disk. /// operating systems which support it, all its space is allocated contiguously on the disk.
/// Operating systems which do not allow contiguous allocation should silently treat this type /// Operating systems which do not allow contiguous allocation should silently treat this type
/// as a normal file. /// as a normal file.
CONTTYPE = 7, CONTTYPE = b'7',
/// Extended header referring to the next file in the archive /// Extended header referring to the next file in the archive
XHDTYPE = b'x', XHDTYPE = b'x',
/// Global extended header /// Global extended header
@ -252,7 +259,9 @@ pub enum TypeFlag {
} }
bitflags::bitflags! { bitflags::bitflags! {
/// UNIX file permissions on octal format. /// UNIX file permissions in octal format.
#[repr(transparent)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct ModeFlags: u64 { pub struct ModeFlags: u64 {
/// Set UID on execution. /// Set UID on execution.
const SetUID = 0o4000; const SetUID = 0o4000;

View File

@ -1,7 +1,7 @@
/* /*
MIT License MIT License
Copyright (c) 2021 Philipp Schuster Copyright (c) 2023 Philipp Schuster
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -21,23 +21,27 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
//! Library to read Tar archives (by GNU Tar) in `no_std` contexts with zero allocations. //! Library to read Tar archives (by GNU Tar) in `no_std` contexts with zero
//! If you have a standard environment and need full feature support, I recommend the use of //! allocations. If you have a standard environment and need full feature
//! <https://crates.io/crates/tar> instead. //! support, I recommend the use of <https://crates.io/crates/tar> instead.
//! //!
//! The crate is simple and only supports reading of "basic" archives, therefore no extensions, such //! The crate is simple and only supports reading of "basic" archives, therefore
//! as GNU Longname. The maximum supported file name length is 100 characters including the NULL-byte. //! no extensions, such as GNU Longname. The maximum supported file name length
//! The maximum supported file size is 8GiB. Also, directories are not supported yet but only flat //! is 100 characters including the NULL-byte. The maximum supported file size
//! collections of files. //! is 8 GiB. Also, directories are not supported yet but only flat collections
//! of files.
//! //!
//! This library is useful, if you write a kernel or a similar low-level application, which needs //! This library is useful, if you write a kernel or a similar low-level
//! "a bunch of files" from an archive ("init ram disk"). The Tar file could for example come //! application, which needs "a bunch of files" from an archive ("init ram
//! as a Multiboot2 boot module provided by the bootloader. //! disk"). The Tar file could for example come as a Multiboot2 boot module
//! provided by the bootloader.
//! //!
//! This crate focuses on extracting files from uncompressed Tar archives created with default options by **GNU Tar**. //! This crate focuses on extracting files from uncompressed Tar archives
//! GNU Extensions such as sparse files, incremental archives, and long filename extension are not supported yet. //! created with default options by **GNU Tar**. GNU Extensions such as sparse
//! [This link](https://www.gnu.org/software/tar/manual/html_section/Formats.html) gives a good overview over possible //! files, incremental archives, and long filename extension are not supported
//! archive formats and their limitations. //! yet. [gnu.org](https://www.gnu.org/software/tar/manual/html_section/Formats.html)
//! provides a good overview over possible archive formats and their
//! limitations.
//! //!
//! # Example //! # Example
//! ```rust //! ```rust
@ -74,6 +78,7 @@ SOFTWARE.
clippy::fallible_impl_from clippy::fallible_impl_from
)] )]
#![deny(missing_debug_implementations)] #![deny(missing_debug_implementations)]
#![deny(rustdoc::all)]
#[cfg_attr(test, macro_use)] #[cfg_attr(test, macro_use)]
#[cfg(test)] #[cfg(test)]
@ -84,6 +89,8 @@ extern crate alloc;
/// Each Archive Entry (either Header or Data Block) is a block of 512 bytes. /// Each Archive Entry (either Header or Data Block) is a block of 512 bytes.
const BLOCKSIZE: usize = 512; const BLOCKSIZE: usize = 512;
/// Maximum filename length of the base Tar format including the terminating NULL-byte.
const FILENAME_MAX_LEN: usize = 100;
mod archive; mod archive;
mod header; mod header;