image: change Symlink(OsString) to Box<OsStr>

...for the same reason as all the others.

Signed-off-by: Allison Karlitskaya <[email protected]>

Author: allisonkarlitskaya

src/fs.rs

@@ -2,11 +2,11 @@ use std::{
     cell::RefCell,
     cmp::max,
     collections::{BTreeMap, HashMap},
-    ffi::{CStr, OsStr, OsString},
+    ffi::{CStr, OsStr},
     fs::File,
     io::Write,
     mem::MaybeUninit,
-    os::unix::ffi::{OsStrExt, OsStringExt},
+    os::unix::ffi::OsStrExt,
     path::Path,
     rc::Rc,
 };
@@ -88,24 +88,24 @@ fn write_directory(
 fn write_leaf(leaf: &Leaf, dirfd: &OwnedFd, name: &OsStr, repo: &Repository) -> Result<()> {
     let mode = leaf.stat.st_mode.into();
 
-    match leaf.content {
+    match &leaf.content {
         LeafContent::Regular(RegularFile::Inline(ref data)) => {
             set_file_contents(dirfd, name, &leaf.stat, data)?
         }
         LeafContent::Regular(RegularFile::External(ref id, size)) => {
             let object = repo.open_object(id)?;
             // TODO: make this better.  At least needs to be EINTR-safe.  Could even do reflink in some cases...
-            let mut buffer = vec![MaybeUninit::uninit(); size as usize];
+            let mut buffer = vec![MaybeUninit::uninit(); *size as usize];
             let (data, _) = read(object, &mut buffer)?;
             set_file_contents(dirfd, name, &leaf.stat, data)?;
         }
-        LeafContent::BlockDevice(rdev) => mknodat(dirfd, name, FileType::BlockDevice, mode, rdev)?,
+        LeafContent::BlockDevice(rdev) => mknodat(dirfd, name, FileType::BlockDevice, mode, *rdev)?,
         LeafContent::CharacterDevice(rdev) => {
-            mknodat(dirfd, name, FileType::CharacterDevice, mode, rdev)?
+            mknodat(dirfd, name, FileType::CharacterDevice, mode, *rdev)?
         }
         LeafContent::Socket => mknodat(dirfd, name, FileType::Socket, mode, 0)?,
         LeafContent::Fifo => mknodat(dirfd, name, FileType::Fifo, mode, 0)?,
-        LeafContent::Symlink(ref target) => symlinkat(target, dirfd, name)?,
+        LeafContent::Symlink(target) => symlinkat(target.as_ref(), dirfd, name)?,
     }
 
     Ok(())
@@ -202,7 +202,7 @@ impl FilesystemReader<'_> {
             }
             FileType::Symlink => {
                 let target = readlinkat(fd, "", [])?;
-                LeafContent::Symlink(OsString::from_vec(target.into_bytes()))
+                LeafContent::Symlink(OsStr::from_bytes(target.as_bytes()).into())
             }
             FileType::CharacterDevice => LeafContent::CharacterDevice(buf.st_rdev),
             FileType::BlockDevice => LeafContent::BlockDevice(buf.st_rdev),

src/image.rs

@@ -1,10 +1,4 @@
-use std::{
-    cell::RefCell,
-    collections::BTreeMap,
-    ffi::{OsStr, OsString},
-    path::Path,
-    rc::Rc,
-};
+use std::{cell::RefCell, collections::BTreeMap, ffi::OsStr, path::Path, rc::Rc};
 
 use anyhow::{bail, Context, Result};
 
@@ -32,7 +26,7 @@ pub enum LeafContent {
     CharacterDevice(u64),
     Fifo,
     Socket,
-    Symlink(OsString),
+    Symlink(Box<OsStr>),
 }
 
 #[derive(Debug)]

src/oci/tar.rs

@@ -146,13 +146,13 @@ fn path_from_tar(pax: Option<Box<[u8]>>, gnu: Vec<u8>, short: &[u8]) -> PathBuf
     PathBuf::from(OsString::from_vec(path))
 }
 
-fn symlink_target_from_tar(pax: Option<Box<[u8]>>, gnu: Vec<u8>, short: &[u8]) -> OsString {
-    if let Some(ref name) = pax {
-        OsString::from(OsStr::from_bytes(name))
+fn symlink_target_from_tar(pax: Option<Box<[u8]>>, gnu: Vec<u8>, short: &[u8]) -> Box<OsStr> {
+    if let Some(name) = pax {
+        OsStr::from_bytes(name.as_ref()).into()
     } else if !gnu.is_empty() {
-        OsString::from_vec(gnu)
+        OsStr::from_bytes(&gnu).into()
     } else {
-        OsString::from(OsStr::from_bytes(short))
+        OsStr::from_bytes(short).into()
     }
 }
 

tests/mkfs.rs

@@ -1,7 +1,7 @@
 use std::{
     cell::RefCell,
     collections::BTreeMap,
-    ffi::{OsStr, OsString},
+    ffi::OsStr,
     io::Write,
     process::{Command, Stdio},
     rc::Rc,
@@ -67,7 +67,7 @@ fn simple(fs: &mut FileSystem) {
     add_leaf(
         &mut fs.root,
         "symlink",
-        LeafContent::Symlink(OsString::from("/target")),
+        LeafContent::Symlink(OsStr::new("/target").into()),
     );
 }