src: adjust a couple of APIs

Rename a couple of things for consistency and clarity.  Add a dirfd
parameter to the read-from-directory code.

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

Author: allisonkarlitskaya

src/bin/cfsctl.rs

@@ -257,7 +257,7 @@ async fn main() -> Result<()> {
             bootable,
             stat_root,
         } => {
-            let mut fs = composefs::fs::read_from_path(path, Some(&repo), stat_root)?;
+            let mut fs = composefs::fs::read_filesystem(CWD, path, Some(&repo), stat_root)?;
             if bootable {
                 fs.transform_for_boot(&repo)?;
             }
@@ -270,7 +270,7 @@ async fn main() -> Result<()> {
             stat_root,
             ref image_name,
         } => {
-            let mut fs = composefs::fs::read_from_path(path, Some(&repo), stat_root)?;
+            let mut fs = composefs::fs::read_filesystem(CWD, path, Some(&repo), stat_root)?;
             if bootable {
                 fs.transform_for_boot(&repo)?;
             }
@@ -282,7 +282,7 @@ async fn main() -> Result<()> {
             bootable,
             stat_root,
         } => {
-            let mut fs = composefs::fs::read_from_path(path, Some(&repo), stat_root)?;
+            let mut fs = composefs::fs::read_filesystem(CWD, path, Some(&repo), stat_root)?;
             if bootable {
                 fs.transform_for_boot(&repo)?;
             }

src/fs.rs

@@ -313,7 +313,8 @@ impl<ObjectID: FsVerityHashValue> FilesystemReader<'_, ObjectID> {
     }
 }
 
-pub fn read_from_path<ObjectID: FsVerityHashValue>(
+pub fn read_filesystem<ObjectID: FsVerityHashValue>(
+    dirfd: impl AsFd,
     path: &Path,
     repo: Option<&Repository<ObjectID>>,
     stat_root: bool,
@@ -323,7 +324,7 @@ pub fn read_from_path<ObjectID: FsVerityHashValue>(
         inodes: HashMap::new(),
     };
 
-    let root = reader.read_directory(CWD, path.as_os_str(), stat_root)?;
+    let root = reader.read_directory(dirfd, path.as_os_str(), stat_root)?;
 
     Ok(FileSystem {
         root,

src/oci/mod.rs

@@ -318,13 +318,13 @@ pub fn write_config<ObjectID: FsVerityHashValue>(
 
 pub fn seal<ObjectID: FsVerityHashValue>(
     repo: &Arc<Repository<ObjectID>>,
-    name: &str,
-    verity: Option<&ObjectID>,
+    config_name: &str,
+    config_verity: Option<&ObjectID>,
 ) -> Result<ContentAndVerity<ObjectID>> {
-    let (mut config, refs) = open_config(repo, name, verity)?;
+    let (mut config, refs) = open_config(repo, config_name, config_verity)?;
     let mut myconfig = config.config().clone().context("no config!")?;
     let labels = myconfig.labels_mut().get_or_insert_with(HashMap::new);
-    let mut fs = crate::oci::image::create_filesystem(repo, name, verity)?;
+    let mut fs = crate::oci::image::create_filesystem(repo, config_name, config_verity)?;
     let id = fs.compute_image_id();
     labels.insert("containers.composefs.fsverity".to_string(), id.to_hex());
     config.set_config(Some(myconfig));