tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/backup/catalog_blob.rs: use write_all() instead of write()

Browse Source 
To correctly handle interrupted system calls.
This commit is contained in:
Dietmar Maurer 2019-09-05 11:40:48 +02:00
parent 1a7a0e74c0
commit 9d456cf8ec
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/backup/catalog_blob.rs
View File

@ -38,9 +38,9 @@ impl <W: Write + Seek> CatalogBlobWriter<W> {
impl <W: Write + Seek> BackupCatalogWriter for CatalogBlobWriter<W> { impl <W: Write + Seek> BackupCatalogWriter for CatalogBlobWriter<W> {
fn start_directory(&mut self, name: &CStr) -> Result<(), Error> { fn start_directory(&mut self, name: &CStr) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::Directory as u8])?; self.writer.write_all(&[CatalogEntryType::Directory as u8])?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
self.writer.write(b"{")?; self.writer.write_all(b"{")?;
self.level += 1; self.level += 1;
Ok(()) Ok(())
} }
@ -49,52 +49,52 @@ impl <W: Write + Seek> BackupCatalogWriter for CatalogBlobWriter<W> {
if self.level == 0 { if self.level == 0 {
bail!("got unexpected end_directory level 0"); bail!("got unexpected end_directory level 0");
} }
self.writer.write(b"}")?; self.writer.write_all(b"}")?;
self.level -= 1; self.level -= 1;
Ok(()) Ok(())
} }
fn add_file(&mut self, name: &CStr, size: u64, mtime: u64) -> Result<(), Error> { fn add_file(&mut self, name: &CStr, size: u64, mtime: u64) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::File as u8])?; self.writer.write_all(&[CatalogEntryType::File as u8])?;
self.writer.write(&size.to_le_bytes())?; self.writer.write_all(&size.to_le_bytes())?;
self.writer.write(&mtime.to_le_bytes())?; self.writer.write_all(&mtime.to_le_bytes())?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
Ok(()) Ok(())
} }
fn add_symlink(&mut self, name: &CStr) -> Result<(), Error> { fn add_symlink(&mut self, name: &CStr) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::Symlink as u8])?; self.writer.write_all(&[CatalogEntryType::Symlink as u8])?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
Ok(()) Ok(())
} }
fn add_hardlink(&mut self, name: &CStr) -> Result<(), Error> { fn add_hardlink(&mut self, name: &CStr) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::Hardlink as u8])?; self.writer.write_all(&[CatalogEntryType::Hardlink as u8])?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
Ok(()) Ok(())
} }
fn add_block_device(&mut self, name: &CStr) -> Result<(), Error> { fn add_block_device(&mut self, name: &CStr) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::BlockDevice as u8])?; self.writer.write_all(&[CatalogEntryType::BlockDevice as u8])?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
Ok(()) Ok(())
} }
fn add_char_device(&mut self, name: &CStr) -> Result<(), Error> { fn add_char_device(&mut self, name: &CStr) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::CharDevice as u8])?; self.writer.write_all(&[CatalogEntryType::CharDevice as u8])?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
Ok(()) Ok(())
} }
fn add_fifo(&mut self, name: &CStr) -> Result<(), Error> { fn add_fifo(&mut self, name: &CStr) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::Fifo as u8])?; self.writer.write_all(&[CatalogEntryType::Fifo as u8])?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
Ok(()) Ok(())
} }
fn add_socket(&mut self, name: &CStr) -> Result<(), Error> { fn add_socket(&mut self, name: &CStr) -> Result<(), Error> {
self.writer.write(&[CatalogEntryType::Socket as u8])?; self.writer.write_all(&[CatalogEntryType::Socket as u8])?;
self.writer.write(name.to_bytes_with_nul())?; self.writer.write_all(name.to_bytes_with_nul())?;
Ok(()) Ok(())
} }
} }